Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / wx / audio_panel.cc

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 10b5a5f76a0d1dfdf01b15a02b3f59c3dfd0057a..82604763c8e690b8e3c884703617794b2e475b6f 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -20,19 +20,21 @@
 #include <boost/lexical_cast.hpp>
 #include <wx/spinctrl.h>
 #include "lib/config.h"
-#include "lib/sound_processor.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"
 
 using std::vector;
 using std::cout;
 using std::string;
+using std::list;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 using boost::shared_ptr;
@@ -81,8 +83,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
        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));
-       _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
+       grid->Add (_stream, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
+       ++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);
        ++r;
        
        _mapping = new AudioMappingView (this);
@@ -93,9 +100,10 @@ AudioPanel::AudioPanel (ContentPanel* p)
        _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));
+       _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));
 }
@@ -129,7 +137,6 @@ AudioPanel::film_content_changed (int property)
                _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) {
@@ -142,9 +149,14 @@ AudioPanel::film_content_changed (int property)
                        
                        if (fcs->audio_stream()) {
                                checked_set (_stream, fcs->audio_stream()->identifier ());
-                               setup_stream_description ();
                        }
                }
+       } 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"));
+               }
        }
 }
 
@@ -160,7 +172,7 @@ AudioPanel::gain_calculate_button_clicked ()
        }
        
        _gain->wrapped()->SetValue (
-               Config::instance()->sound_processor()->db_for_fader_change (
+               Config::instance()->cinema_sound_processor()->db_for_fader_change (
                        d->wanted_fader (),
                        d->actual_fader ()
                        )
@@ -216,32 +228,20 @@ AudioPanel::stream_changed ()
        if (i != a.end ()) {
                fcs->set_audio_stream (*i);
        }
-
-       setup_stream_description ();
 }
 
 void
-AudioPanel::setup_stream_description ()
+AudioPanel::processor_changed ()
 {
-       FFmpegContentList fc = _parent->selected_ffmpeg ();
-       if (fc.size() != 1) {
-               _description->SetLabel ("");
-               return;
+       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);
        }
-
-       shared_ptr<FFmpegContent> fcs = fc.front ();
-
-       if (!fcs->audio_stream ()) {
-               _description->SetLabel (wxT (""));
-       } else {
-               wxString s;
-               if (fcs->audio_channels() == 1) {
-                       s << _("1 channel");
-               } else {
-                       s << fcs->audio_channels() << wxT (" ") << _("channels");
-               }
-               s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
-               _description->SetLabel (s);
+               
+       AudioContentList c = _parent->selected_audio ();
+       for (AudioContentList::const_iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->set_audio_processor (p);
        }
 }
 
@@ -266,11 +266,37 @@ AudioPanel::content_selection_changed ()
        _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);
 }
+
+void
+AudioPanel::setup_processors ()
+{
+       AudioContentList sel = _parent->selected_audio ();
+
+       _processor->Clear ();
+       list<AudioProcessor const *> ap = AudioProcessor::all ();
+       _processor->Append (_("None"), new wxStringClientData (N_("none")));
+       for (list<AudioProcessor const *>::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 ())));
+               }
+       }
+}