#include "lib/config.h"
#include "lib/sound_processor.h"
#include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
#include "audio_dialog.h"
#include "audio_panel.h"
#include "audio_mapping_view.h"
: FilmEditorPanel (e, _("Audio"))
, _audio_dialog (0)
{
- wxFlexGridSizer* grid = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (grid, 0, wxALL, 8);
+ int r = 0;
+
_show = new wxButton (this, wxID_ANY, _("Show Audio..."));
- grid->Add (_show, 1);
- grid->AddSpacer (0);
- grid->AddSpacer (0);
-
- add_label_to_sizer (grid, this, _("Audio Gain"), true);
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _gain = new wxSpinCtrl (this);
- s->Add (_gain, 1);
- add_label_to_sizer (s, this, _("dB"), false);
- grid->Add (s, 1);
- }
+ grid->Add (_show, wxGBPosition (r, 0));
+ ++r;
+
+ add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+ _gain = new ContentSpinCtrlDouble<AudioContent> (
+ this,
+ new wxSpinCtrlDouble (this),
+ AudioContentProperty::AUDIO_GAIN,
+ boost::mem_fn (&AudioContent::audio_gain),
+ boost::mem_fn (&AudioContent::set_audio_gain)
+ );
+ _gain->add (grid, wxGBPosition (r, 1));
+ add_label_to_grid_bag_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
- grid->Add (_gain_calculate_button);
-
- add_label_to_sizer (grid, this, _("Audio Delay"), false);
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _delay = new wxSpinCtrl (this);
- s->Add (_delay, 1);
- /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
- add_label_to_sizer (s, this, _("ms"), false);
- grid->Add (s);
- }
-
- grid->AddSpacer (0);
+ grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
+ ++r;
+
+ add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
+ _delay = new ContentSpinCtrl<AudioContent> (
+ this,
+ new wxSpinCtrl (this),
+ AudioContentProperty::AUDIO_DELAY,
+ boost::mem_fn (&AudioContent::audio_delay),
+ boost::mem_fn (&AudioContent::set_audio_delay)
+ );
+
+ _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_sizer (grid, this, _("Audio Stream"), true);
+ add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
_stream = new wxChoice (this, wxID_ANY);
- grid->Add (_stream, 1, wxEXPAND);
- _description = new wxStaticText (this, wxID_ANY, wxT (""));
- grid->AddSpacer (0);
-
- grid->Add (_description, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
- grid->AddSpacer (0);
- grid->AddSpacer (0);
+ grid->Add (_stream, wxGBPosition (r, 1));
+ _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);
- _gain->SetRange (-60, 60);
- _delay->SetRange (-1000, 1000);
+ _gain->wrapped()->SetRange (-60, 60);
+ _gain->wrapped()->SetDigits (1);
+ _gain->wrapped()->SetIncrement (0.5);
+ _delay->wrapped()->SetRange (-1000, 1000);
- _delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AudioPanel::delay_changed, this));
_stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::stream_changed, this));
_show->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::show_clicked, this));
- _gain->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AudioPanel::gain_changed, this));
_gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
_mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
fcs = dynamic_pointer_cast<FFmpegContent> (acs);
}
- if (_audio_dialog && acs) {
- _audio_dialog->set_content (acs);
- }
-
- if (property == AudioContentProperty::AUDIO_GAIN) {
- checked_set (_gain, acs ? acs->audio_gain() : 0);
- } else if (property == AudioContentProperty::AUDIO_DELAY) {
- checked_set (_delay, acs ? acs->audio_delay() : 0);
- } else if (property == AudioContentProperty::AUDIO_MAPPING) {
+ if (property == AudioContentProperty::AUDIO_MAPPING) {
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
_sizer->Layout ();
} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
setup_stream_description ();
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
+ _sizer->Layout ();
} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
_stream->Clear ();
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 ();
}
}
}
}
-void
-AudioPanel::gain_changed ()
-{
- AudioContentList ac = _editor->selected_audio_content ();
- if (ac.size() != 1) {
- return;
- }
-
- ac.front()->set_audio_gain (_gain->GetValue ());
-}
-
-void
-AudioPanel::delay_changed ()
-{
- AudioContentList ac = _editor->selected_audio_content ();
- if (ac.size() != 1) {
- return;
- }
-
- ac.front()->set_audio_delay (_delay->GetValue ());
-}
-
void
AudioPanel::gain_calculate_button_clicked ()
{
return;
}
- _gain->SetValue (
+ _gain->wrapped()->SetValue (
Config::instance()->sound_processor()->db_for_fader_change (
d->wanted_fader (),
d->actual_fader ()
/* This appears to be necessary, as the change is not signalled,
I think.
*/
- gain_changed ();
+ _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;
}
{
FFmpegContentList fc = _editor->selected_ffmpeg_content ();
if (fc.size() != 1) {
+ _description->SetLabel ("");
return;
}
} else {
s << fcs->audio_channels() << wxT (" ") << _("channels");
}
- s << wxT (", ") << fcs->content_audio_frame_rate() << _("Hz");
+ s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
_description->SetLabel (s);
}
}
void
AudioPanel::content_selection_changed ()
{
+ AudioContentList sel = _editor->selected_audio_content ();
+
+ if (_audio_dialog && sel.size() == 1) {
+ _audio_dialog->set_content (sel.front ());
+ }
+
+ _gain->set_content (sel);
+ _delay->set_content (sel);
+
+ _show->Enable (sel.size() == 1);
+ _stream->Enable (sel.size() == 1);
+ _mapping->Enable (sel.size() == 1);
+ film_content_changed (AudioContentProperty::AUDIO_MAPPING);
+ film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
+ film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
}
projects / dcpomatic.git / blobdiff