Merge branch '2.0' of git.carlh.net:git/dcpomatic 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 e27e10752abb64c4135f4f5ce431f74a2944b0f3..4d783ca9da71b9e6f5ec69c2b87fb7afaf8ee6e2 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 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
@@ -17,8 +17,6 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
 #include "lib/config.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
@@ -29,12 +27,16 @@
 #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;
@@ -83,18 +85,26 @@ 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, 2), wxGBSpan (1, 2));
+       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));
+       grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
        ++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->wrapped()->SetRange (-60, 60);
        _gain->wrapped()->SetDigits (1);
@@ -106,7 +116,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
        _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));
 }
 
 
@@ -118,6 +128,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;
        }
@@ -137,22 +150,24 @@ AudioPanel::film_content_changed (int property)
        if (property == AudioContentProperty::AUDIO_MAPPING) {
                _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
                _sizer->Layout ();
+       } else if (property == AudioContentProperty::AUDIO_FRAME_RATE) {
+               setup_description ();
        } else if (property == FFmpegContentProperty::AUDIO_STREAM) {
-               setup_stream_description ();
                _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
                _sizer->Layout ();
        } else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
-               _stream->Clear ();
                if (fcs) {
-                       vector<shared_ptr<FFmpegAudioStream> > a = fcs->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 ((*i)->identifier ())));
+                       vector<pair<string, string> > data;
+                       BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, fcs->audio_streams ()) {
+                               data.push_back (make_pair (i->name, i->identifier ()));
                        }
+                       checked_set (_stream, data);
                        
                        if (fcs->audio_stream()) {
                                checked_set (_stream, fcs->audio_stream()->identifier ());
-                               setup_stream_description ();
                        }
+               } else {
+                       _stream->Clear ();
                }
        } else if (property == AudioContentProperty::AUDIO_PROCESSOR) {
                if (acs) {
@@ -167,9 +182,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;
        }
@@ -202,7 +217,7 @@ 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 ());
 }
@@ -231,33 +246,6 @@ AudioPanel::stream_changed ()
        if (i != a.end ()) {
                fcs->set_audio_stream (*i);
        }
-
-       setup_stream_description ();
-}
-
-void
-AudioPanel::setup_stream_description ()
-{
-       FFmpegContentList fc = _parent->selected_ffmpeg ();
-       if (fc.size() != 1) {
-               _description->SetLabel ("");
-               return;
-       }
-
-       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);
-       }
 }
 
 void
@@ -275,6 +263,18 @@ AudioPanel::processor_changed ()
        }
 }
 
+void
+AudioPanel::setup_description ()
+{
+       AudioContentList ac = _parent->selected_audio ();
+       if (ac.size () != 1) {
+               checked_set (_description, wxT (""));
+               return;
+       }
+
+       checked_set (_description, ac.front()->processing_description ());
+}
+
 void
 AudioPanel::mapping_changed (AudioMapping m)
 {
@@ -306,6 +306,7 @@ AudioPanel::content_selection_changed ()
 
        film_content_changed (AudioContentProperty::AUDIO_MAPPING);
        film_content_changed (AudioContentProperty::AUDIO_PROCESSOR);
+       film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE);
        film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
        film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
 }