X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=4b6167bf7fba781f5bdc40f42df9d755c5cd1c32;hb=25e57e5d061c02674f36e4de093a2bf805e328cb;hp=b3e78397dd42285e7f92db2b5a605a45777fee43;hpb=9348d4b229e6a7e7d69df27f63f89338bbac1eaa;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b3e78397d..4b6167bf7 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,24 +17,24 @@ */ -#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" #include "audio_mapping_view.h" #include "wx_util.h" #include "gain_calculator_dialog.h" -#include "film_editor.h" +#include "content_panel.h" +#include "audio_dialog.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; @@ -48,8 +48,8 @@ AudioPanel::AudioPanel (ContentPanel* p) int r = 0; - _show = new wxButton (this, wxID_ANY, _("Show Audio...")); - grid->Add (_show, wxGBPosition (r, 0)); + _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels...")); + grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); @@ -60,7 +60,7 @@ AudioPanel::AudioPanel (ContentPanel* p) 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...")); @@ -75,47 +75,53 @@ AudioPanel::AudioPanel (ContentPanel* p) 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_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)); + _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)); - _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); + _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); } +AudioPanel::~AudioPanel () +{ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } +} void AudioPanel::film_changed (Film::Property property) { switch (property) { case Film::AUDIO_CHANNELS: - _mapping->set_channels (_parent->film()->audio_channels ()); - _sizer->Layout (); + case Film::AUDIO_PROCESSOR: + _mapping->set_output_channels (_parent->film()->audio_output_names ()); + break; + case Film::VIDEO_FRAME_RATE: + setup_description (); break; default: break; @@ -125,38 +131,16 @@ AudioPanel::film_changed (Film::Property property) void AudioPanel::film_content_changed (int property) { - AudioContentList ac = _parent->selected_audio (); - shared_ptr acs; - shared_ptr fcs; - if (ac.size() == 1) { - acs = ac.front (); - fcs = dynamic_pointer_cast (acs); - } - - if (property == AudioContentProperty::AUDIO_MAPPING) { - _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")); + 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 { - checked_set (_processor, N_("none")); + _mapping->set (AudioMapping ()); } + setup_description (); + _sizer->Layout (); } } @@ -164,13 +148,13 @@ 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; } - + _gain->wrapped()->SetValue ( Config::instance()->cinema_sound_processor()->db_for_fader_change ( d->wanted_fader (), @@ -182,67 +166,20 @@ AudioPanel::gain_calculate_button_clicked () I think. */ _gain->view_changed (); - + d->Destroy (); } void -AudioPanel::show_clicked () +AudioPanel::setup_description () { - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = 0; - } - AudioContentList ac = _parent->selected_audio (); - if (ac.size() != 1) { + if (ac.size () != 1) { + checked_set (_description, wxT ("")); return; } - - _audio_dialog = new AudioDialog (this); - _audio_dialog->Show (); - _audio_dialog->set_content (ac.front ()); -} - -void -AudioPanel::stream_changed () -{ - FFmpegContentList fc = _parent->selected_ffmpeg (); - if (fc.size() != 1) { - return; - } - - shared_ptr fcs = fc.front (); - - if (_stream->GetSelection() == -1) { - 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 @@ -259,44 +196,28 @@ AudioPanel::content_selection_changed () { AudioContentList sel = _parent->selected_audio (); - if (_audio_dialog && sel.size() == 1) { - _audio_dialog->set_content (sel.front ()); - } - _gain->set_content (sel); _delay->set_content (sel); _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); + film_content_changed (AudioContentProperty::AUDIO_STREAMS); } void -AudioPanel::setup_processors () +AudioPanel::show_clicked () { - 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 (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } - if (j == sel.end ()) { - _processor->Append (std_to_wx ((*i)->name ()), new wxStringClientData (std_to_wx ((*i)->id ()))); - } + AudioContentList ac = _parent->selected_audio (); + if (ac.size() != 1) { + return; } + + _audio_dialog = new AudioDialog (this, _parent->film (), ac.front ()); + _audio_dialog->Show (); }