X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=8b2682762c4984fbfcd83e03958481eb07982767;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=82604763c8e690b8e3c884703617794b2e475b6f;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 82604763c..8b2682762 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 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,12 +17,8 @@ */ -#include -#include #include "lib/config.h" #include "lib/ffmpeg_content.h" -#include "lib/ffmpeg_audio_stream.h" -#include "lib/audio_processor.h" #include "lib/cinema_sound_processor.h" #include "audio_dialog.h" #include "audio_panel.h" @@ -30,11 +26,15 @@ #include "wx_util.h" #include "gain_calculator_dialog.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; @@ -81,31 +81,27 @@ AudioPanel::AudioPanel (ContentPanel* p) add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2)); ++r; - 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), wxGBSpan (1, 3), wxEXPAND); + _mapping = new AudioMappingView (this); + _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); ++r; - add_label_to_grid_bag_sizer (grid, this, _("Process with"), true, wxGBPosition (r, 0)); - _processor = new wxChoice (this, wxID_ANY); - setup_processors (); - grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND); + _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; - - _mapping = new AudioMappingView (this); - _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); _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)); _show->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::show_clicked, this)); _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this)); - _processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::processor_changed, this)); - _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); + _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); } @@ -117,6 +113,9 @@ AudioPanel::film_changed (Film::Property property) _mapping->set_channels (_parent->film()->audio_channels ()); _sizer->Layout (); break; + case Film::VIDEO_FRAME_RATE: + setup_description (); + break; default: break; } @@ -133,30 +132,10 @@ AudioPanel::film_content_changed (int property) fcs = dynamic_pointer_cast (acs); } - if (property == AudioContentProperty::AUDIO_MAPPING) { + if (property == AudioContentProperty::AUDIO_STREAMS) { _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); _sizer->Layout (); - } else if (property == FFmpegContentProperty::AUDIO_STREAM) { - _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); - _sizer->Layout (); - } else if (property == FFmpegContentProperty::AUDIO_STREAMS) { - _stream->Clear (); - if (fcs) { - vector > a = fcs->audio_streams (); - for (vector >::iterator i = a.begin(); i != a.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); - } - - if (fcs->audio_stream()) { - checked_set (_stream, fcs->audio_stream()->identifier ()); - } - } - } else if (property == AudioContentProperty::AUDIO_PROCESSOR) { - if (acs) { - checked_set (_processor, acs->audio_processor() ? acs->audio_processor()->id() : N_("none")); - } else { - checked_set (_processor, N_("none")); - } + setup_description (); } } @@ -164,9 +143,9 @@ void 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; } @@ -199,50 +178,21 @@ AudioPanel::show_clicked () return; } - _audio_dialog = new AudioDialog (this); + _audio_dialog = new AudioDialog (this, _parent->film ()); _audio_dialog->Show (); _audio_dialog->set_content (ac.front ()); } void -AudioPanel::stream_changed () +AudioPanel::setup_description () { - FFmpegContentList fc = _parent->selected_ffmpeg (); - if (fc.size() != 1) { - return; - } - - shared_ptr fcs = fc.front (); - - if (_stream->GetSelection() == -1) { + AudioContentList ac = _parent->selected_audio (); + if (ac.size () != 1) { + checked_set (_description, wxT ("")); return; } - - vector > a = fcs->audio_streams (); - vector >::iterator i = a.begin (); - string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && (*i)->identifier () != s) { - ++i; - } - if (i != a.end ()) { - fcs->set_audio_stream (*i); - } -} - -void -AudioPanel::processor_changed () -{ - string const s = string_client_data (_processor->GetClientObject (_processor->GetSelection ())); - AudioProcessor const * p = 0; - if (s != wx_to_std (N_("none"))) { - p = AudioProcessor::from_id (s); - } - - AudioContentList c = _parent->selected_audio (); - for (AudioContentList::const_iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_audio_processor (p); - } + checked_set (_description, ac.front()->processing_description ()); } void @@ -268,35 +218,7 @@ AudioPanel::content_selection_changed () _gain_calculate_button->Enable (sel.size() == 1); _show->Enable (sel.size() == 1); - _stream->Enable (sel.size() == 1); - _processor->Enable (!sel.empty()); _mapping->Enable (sel.size() == 1); - setup_processors (); - - film_content_changed (AudioContentProperty::AUDIO_MAPPING); - film_content_changed (AudioContentProperty::AUDIO_PROCESSOR); - film_content_changed (FFmpegContentProperty::AUDIO_STREAM); film_content_changed (FFmpegContentProperty::AUDIO_STREAMS); } - -void -AudioPanel::setup_processors () -{ - AudioContentList sel = _parent->selected_audio (); - - _processor->Clear (); - list ap = AudioProcessor::all (); - _processor->Append (_("None"), new wxStringClientData (N_("none"))); - for (list::const_iterator i = ap.begin(); i != ap.end(); ++i) { - - AudioContentList::const_iterator j = sel.begin(); - while (j != sel.end() && (*i)->in_channels().includes ((*j)->audio_channels ())) { - ++j; - } - - if (j == sel.end ()) { - _processor->Append (std_to_wx ((*i)->name ()), new wxStringClientData (std_to_wx ((*i)->id ()))); - } - } -}