grid->Add (_show, wxGBPosition (r, 0));
++r;
- add_label_to_grid_bag_sizer (grid, this, _("Audio Gain"), true, wxGBPosition (r, 0));
- _gain = new ContentSpinCtrl<AudioContent> (
+ add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+ _gain = new ContentSpinCtrlDouble<AudioContent> (
this,
- new wxSpinCtrl (this),
+ new wxSpinCtrlDouble (this),
AudioContentProperty::AUDIO_GAIN,
boost::mem_fn (&AudioContent::audio_gain),
boost::mem_fn (&AudioContent::set_audio_gain)
grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
++r;
- add_label_to_grid_bag_sizer (grid, this, _("Audio Delay"), true, wxGBPosition (r, 0));
+ add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
_delay = new ContentSpinCtrl<AudioContent> (
this,
new wxSpinCtrl (this),
boost::mem_fn (&AudioContent::set_audio_delay)
);
- _delay->add (grid, wxGBPosition (r,1 ));
+ _delay->add (grid, wxGBPosition (r, 1));
/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
++r;
- add_label_to_grid_bag_sizer (grid, this, _("Audio Stream"), true, wxGBPosition (r, 0));
+ add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
_stream = new wxChoice (this, wxID_ANY);
grid->Add (_stream, wxGBPosition (r, 1));
- ++r;
-
- _description = new wxStaticText (this, wxID_ANY, wxT (""));
- grid->Add (_description, wxGBPosition (r, 0));
+ _stream_description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
++r;
_mapping = new AudioMappingView (this);
_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
+ ++r;
+
+ _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
+ _sizer->Add (_description, 0, wxALL, 12);
+ wxFont font = _description->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ _description->SetFont (font);
+ ++r;
_gain->wrapped()->SetRange (-60, 60);
+ _gain->wrapped()->SetDigits (1);
+ _gain->wrapped()->SetIncrement (0.5);
_delay->wrapped()->SetRange (-1000, 1000);
_stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::stream_changed, this));
_mapping->set_channels (_editor->film()->audio_channels ());
_sizer->Layout ();
break;
+ case Film::VIDEO_FRAME_RATE:
+ setup_description ();
+ break;
default:
break;
}
if (property == AudioContentProperty::AUDIO_MAPPING) {
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
_sizer->Layout ();
+ } else if (property == AudioContentProperty::AUDIO_FRAME_RATE) {
+ setup_description ();
} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
setup_stream_description ();
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
if (fcs) {
vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
for (vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
- _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+ _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
}
if (fcs->audio_stream()) {
- checked_set (_stream, lexical_cast<string> (fcs->audio_stream()->id));
+ checked_set (_stream, fcs->audio_stream()->identifier ());
setup_stream_description ();
}
}
/* This appears to be necessary, as the change is not signalled,
I think.
*/
- _gain->update_from_model ();
+ _gain->view_changed ();
d->Destroy ();
}
vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin ();
string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
- while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+ while (i != a.end() && (*i)->identifier () != s) {
++i;
}
setup_stream_description ();
}
+void
+AudioPanel::setup_description ()
+{
+ AudioContentList ac = _editor->selected_audio_content ();
+ if (ac.size () != 1) {
+ _description->SetLabel ("");
+ return;
+ }
+
+ shared_ptr<AudioContent> acs = ac.front ();
+ if (acs->content_audio_frame_rate() != acs->output_audio_frame_rate ()) {
+ _description->SetLabel (wxString::Format (
+ _("Audio will be resampled from %.3fkHz to %.3fkHz."),
+ acs->content_audio_frame_rate() / 1000.0,
+ acs->output_audio_frame_rate() / 1000.0
+ ));
+ } else {
+ _description->SetLabel (_("Audio will not be resampled."));
+ }
+}
+
void
AudioPanel::setup_stream_description ()
{
FFmpegContentList fc = _editor->selected_ffmpeg_content ();
if (fc.size() != 1) {
+ _stream_description->SetLabel ("");
return;
}
shared_ptr<FFmpegContent> fcs = fc.front ();
if (!fcs->audio_stream ()) {
- _description->SetLabel (wxT (""));
+ _stream_description->SetLabel (wxT (""));
} else {
wxString s;
if (fcs->audio_channels() == 1) {
s << fcs->audio_channels() << wxT (" ") << _("channels");
}
s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz");
- _description->SetLabel (s);
+ _stream_description->SetLabel (s);
}
}
_mapping->Enable (sel.size() == 1);
film_content_changed (AudioContentProperty::AUDIO_MAPPING);
+ film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE);
film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
}