X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=c31d5b57502b12d9ae67d5fb31a9d2d144e039bd;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=b686b6154634ec919b6d4b93904875aa9d958ff6;hpb=a9fad9e29d9a9d6d006a77ec5c1c0572704dfeb7;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b686b6154..c31d5b575 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,82 +17,84 @@ */ -#include -#include #include "lib/config.h" -#include "lib/sound_processor.h" -#include "audio_dialog.h" +#include "lib/ffmpeg_content.h" +#include "lib/cinema_sound_processor.h" #include "audio_panel.h" #include "audio_mapping_view.h" #include "wx_util.h" #include "gain_calculator_dialog.h" -#include "film_editor.h" +#include "content_panel.h" +#include +#include +#include using std::vector; using std::cout; using std::string; +using std::list; +using std::pair; using boost::dynamic_pointer_cast; using boost::lexical_cast; using boost::shared_ptr; -AudioPanel::AudioPanel (FilmEditor* e) - : FilmEditorPanel (e, _("Audio")) - , _audio_dialog (0) +AudioPanel::AudioPanel (ContentPanel* p) + : ContentSubPanel (p, _("Audio")) { - 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); - _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); - } - + int r = 0; + + add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); + _gain = new ContentSpinCtrlDouble ( + 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->Add (_gain_calculate_button, wxGBPosition (r, 3)); + ++r; + + add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); + _delay = new ContentSpinCtrl ( + 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; - grid->AddSpacer (0); - - add_label_to_sizer (grid, this, _("Audio Stream"), true); - _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); - _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->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->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::delay_changed), 0, this); - _stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioPanel::stream_changed), 0, this); - _show->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (AudioPanel::show_clicked), 0, this); - _gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::gain_changed), 0, this); - _gain_calculate_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (AudioPanel::gain_calculate_button_clicked), 0, this); - _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); + _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this)); + + _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); } @@ -100,9 +102,12 @@ void AudioPanel::film_changed (Film::Property property) { switch (property) { - case Film::DCP_AUDIO_CHANNELS: - _mapping->set_channels (_editor->film()->dcp_audio_channels ()); - _sizer->Layout (); + case Film::AUDIO_CHANNELS: + case Film::AUDIO_PROCESSOR: + _mapping->set_output_channels (_parent->film()->audio_output_names ()); + break; + case Film::VIDEO_FRAME_RATE: + setup_description (); break; default: break; @@ -110,72 +115,34 @@ AudioPanel::film_changed (Film::Property property) } void -AudioPanel::film_content_changed (shared_ptr c, int property) +AudioPanel::film_content_changed (int property) { - shared_ptr ac = dynamic_pointer_cast (c); - shared_ptr fc = dynamic_pointer_cast (c); - - if (_audio_dialog && _editor->selected_audio_content()) { - _audio_dialog->set_content (_editor->selected_audio_content ()); - } - - if (property == AudioContentProperty::AUDIO_GAIN) { - checked_set (_gain, ac ? ac->audio_gain() : 0); - } else if (property == AudioContentProperty::AUDIO_DELAY) { - checked_set (_delay, ac ? ac->audio_delay() : 0); - } else if (property == AudioContentProperty::AUDIO_MAPPING) { - _mapping->set (ac ? ac->audio_mapping () : AudioMapping ()); - _sizer->Layout (); - } else if (property == FFmpegContentProperty::AUDIO_STREAMS) { - _stream->Clear (); - if (fc) { - vector > a = fc->audio_streams (); - for (vector >::iterator i = a.begin(); i != a.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast ((*i)->id)))); - } - - if (fc->audio_stream()) { - checked_set (_stream, lexical_cast (fc->audio_stream()->id)); - } + if (property == AudioContentProperty::AUDIO_STREAMS) { + AudioContentList ac = _parent->selected_audio (); + if (ac.size() == 1) { + _mapping->set (ac.front()->audio_mapping()); + _mapping->set_input_channels (ac.front()->audio_channel_names ()); + } else { + _mapping->set (AudioMapping ()); } + setup_description (); + _sizer->Layout (); } } void -AudioPanel::gain_changed (wxCommandEvent &) -{ - shared_ptr ac = _editor->selected_audio_content (); - if (!ac) { - return; - } - - ac->set_audio_gain (_gain->GetValue ()); -} - -void -AudioPanel::delay_changed (wxCommandEvent &) -{ - shared_ptr ac = _editor->selected_audio_content (); - if (!ac) { - return; - } - - ac->set_audio_delay (_delay->GetValue ()); -} - -void -AudioPanel::gain_calculate_button_clicked (wxCommandEvent &) +AudioPanel::gain_calculate_button_clicked () { GainCalculatorDialog* d = new GainCalculatorDialog (this); - d->ShowModal (); + int const r = d->ShowModal (); - if (d->wanted_fader() == 0 || d->actual_fader() == 0) { + if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) { d->Destroy (); return; } - - _gain->SetValue ( - Config::instance()->sound_processor()->db_for_fader_change ( + + _gain->wrapped()->SetValue ( + Config::instance()->cinema_sound_processor()->db_for_fader_change ( d->wanted_fader (), d->actual_fader () ) @@ -184,81 +151,42 @@ AudioPanel::gain_calculate_button_clicked (wxCommandEvent &) /* This appears to be necessary, as the change is not signalled, I think. */ - wxCommandEvent dummy; - gain_changed (dummy); - + _gain->view_changed (); + d->Destroy (); } void -AudioPanel::show_clicked (wxCommandEvent &) +AudioPanel::setup_description () { - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = 0; - } - - shared_ptr c = _editor->selected_content (); - if (!c) { + AudioContentList ac = _parent->selected_audio (); + if (ac.size () != 1) { + checked_set (_description, wxT ("")); return; } - shared_ptr ac = dynamic_pointer_cast (c); - if (!ac) { - return; - } - - _audio_dialog = new AudioDialog (this); - _audio_dialog->Show (); - _audio_dialog->set_content (ac); + checked_set (_description, ac.front()->processing_description ()); } void -AudioPanel::stream_changed (wxCommandEvent &) +AudioPanel::mapping_changed (AudioMapping m) { - shared_ptr c = _editor->selected_content (); - if (!c) { - return; - } - - shared_ptr fc = dynamic_pointer_cast (c); - if (!fc) { - return; - } - - vector > a = fc->audio_streams (); - vector >::iterator i = a.begin (); - string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && lexical_cast ((*i)->id) != s) { - ++i; - } - - if (i != a.end ()) { - fc->set_audio_stream (*i); - } - - if (!fc->audio_stream ()) { - _description->SetLabel (wxT ("")); - } else { - wxString s; - if (fc->audio_channels() == 1) { - s << _("1 channel"); - } else { - s << fc->audio_channels() << wxT (" ") << _("channels"); - } - s << wxT (", ") << fc->content_audio_frame_rate() << _("Hz"); - _description->SetLabel (s); + AudioContentList c = _parent->selected_audio (); + if (c.size() == 1) { + c.front()->set_audio_mapping (m); } } void -AudioPanel::mapping_changed (AudioMapping m) +AudioPanel::content_selection_changed () { - shared_ptr c = _editor->selected_audio_content (); - if (!c) { - return; - } + AudioContentList sel = _parent->selected_audio (); - c->set_audio_mapping (m); -} + _gain->set_content (sel); + _delay->set_content (sel); + + _gain_calculate_button->Enable (sel.size() == 1); + _mapping->Enable (sel.size() == 1); + film_content_changed (AudioContentProperty::AUDIO_STREAMS); +}