Layout the audio mapping's sizer after it changes (#597).
[dcpomatic.git] / src / wx / audio_panel.cc
index f8dba6cd47fa88f1c1002913f192ae9741e247df..006b12398a6148f3e7738042dcd824b2429bdbba 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     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
 
 */
 
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
 #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 <wx/spinctrl.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 
 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);
+       int r = 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);
-       }
+       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);
-
-       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);
+       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;
+
        _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->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));
+       _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));
 }
 
 
@@ -102,8 +103,11 @@ AudioPanel::film_changed (Film::Property property)
 {
        switch (property) {
        case Film::AUDIO_CHANNELS:
-               _mapping->set_channels (_editor->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;
@@ -111,75 +115,34 @@ AudioPanel::film_changed (Film::Property property)
 }
 
 void
-AudioPanel::film_content_changed (shared_ptr<Content> c, int property)
+AudioPanel::film_content_changed (int property)
 {
-       shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c);
-       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (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_STREAM) {
-               setup_stream_description ();
-       } else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
-               _stream->Clear ();
-               if (fc) {
-                       vector<shared_ptr<FFmpegAudioStream> > a = fc->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))));
-                       }
-                       
-                       if (fc->audio_stream()) {
-                               checked_set (_stream, lexical_cast<string> (fc->audio_stream()->id));
-                               setup_stream_description ();
-                       }
+       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 ()
-{
-       shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
-       if (!ac) {
-               return;
-       }
-
-       ac->set_audio_gain (_gain->GetValue ());
-}
-
-void
-AudioPanel::delay_changed ()
-{
-       shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
-       if (!ac) {
-               return;
-       }
-
-       ac->set_audio_delay (_delay->GetValue ());
-}
-
 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->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 ()
                        )
@@ -188,100 +151,42 @@ AudioPanel::gain_calculate_button_clicked ()
        /* This appears to be necessary, as the change is not signalled,
           I think.
        */
-       gain_changed ();
+       _gain->view_changed ();
        
        d->Destroy ();
 }
 
 void
-AudioPanel::show_clicked ()
+AudioPanel::setup_description ()
 {
-       if (_audio_dialog) {
-               _audio_dialog->Destroy ();
-               _audio_dialog = 0;
-       }
-
-       shared_ptr<Content> c = _editor->selected_content ();
-       if (!c) {
+       AudioContentList ac = _parent->selected_audio ();
+       if (ac.size () != 1) {
+               checked_set (_description, wxT (""));
                return;
        }
 
-       shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (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 ()
+AudioPanel::mapping_changed (AudioMapping m)
 {
-       shared_ptr<Content> c = _editor->selected_content ();
-       if (!c) {
-               return;
-       }
-       
-       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
-       if (!fc) {
-               return;
-       }
-
-       if (_stream->GetSelection() == -1) {
-               return;
-       }
-       
-       vector<shared_ptr<FFmpegAudioStream> > a = fc->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) {
-               ++i;
-       }
-
-       if (i != a.end ()) {
-               fc->set_audio_stream (*i);
+       AudioContentList c = _parent->selected_audio ();
+       if (c.size() == 1) {
+               c.front()->set_audio_mapping (m);
        }
-
-       setup_stream_description ();
 }
 
 void
-AudioPanel::setup_stream_description ()
+AudioPanel::content_selection_changed ()
 {
-       shared_ptr<Content> c = _editor->selected_content ();
-       if (!c) {
-               return;
-       }
-       
-       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
-       if (!fc) {
-               return;
-       }
+       AudioContentList sel = _parent->selected_audio ();
 
-       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);
-       }
-}
+       _gain->set_content (sel);
+       _delay->set_content (sel);
 
-void
-AudioPanel::mapping_changed (AudioMapping m)
-{
-       shared_ptr<AudioContent> c = _editor->selected_audio_content ();
-       if (!c) {
-               return;
-       }
+       _gain_calculate_button->Enable (sel.size() == 1);
+       _mapping->Enable (sel.size() == 1);
 
-       c->set_audio_mapping (m);
+       film_content_changed (AudioContentProperty::AUDIO_STREAMS);
 }
-