Merge master.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index b7736f6647a5df222266c208888467f28b7e38f3..bfd92f0b65e8db97508cb61ee775e75121086662 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -18,10 +18,10 @@
 */
 
 #include <boost/filesystem.hpp>
+#include "lib/audio_analysis.h"
+#include "lib/film.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
-#include "audio_analysis.h"
-#include "film.h"
 #include "wx_util.h"
 
 using boost::shared_ptr;
@@ -35,20 +35,27 @@ AudioDialog::AudioDialog (wxWindow* parent)
        wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _plot = new AudioPlot (this);
-       sizer->Add (_plot, 1, wxALL, 12);
+       sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
+
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
 
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i));
-               table->Add (_channel_checkbox[i], 1, wxEXPAND);
-               table->AddSpacer (0);
+               _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+               side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3);
                _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this);
        }
 
-       table->AddSpacer (0);
-       table->AddSpacer (0);
-
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
        wxString const types[] = {
                _("Peak"),
                _("RMS")
@@ -56,17 +63,20 @@ AudioDialog::AudioDialog (wxWindow* parent)
 
        for (int i = 0; i < AudioPoint::COUNT; ++i) {
                _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
-               table->Add (_type_checkbox[i], 1, wxEXPAND);
-               table->AddSpacer (0);
+               side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3);
                _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this);
        }
 
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
        _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
        _smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this);
-       table->Add (_smoothing, 1, wxEXPAND);
-       table->AddSpacer (0);
+       side->Add (_smoothing, 1, wxEXPAND);
 
-       sizer->Add (table, 0, wxALL, 12);
+       sizer->Add (side, 0, wxALL, 12);
 
        SetSizer (sizer);
        sizer->Layout ();
@@ -74,40 +84,22 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_film (shared_ptr<Film> f)
 {
        _film_changed_connection.disconnect ();
-       _film_audio_analysis_finished_connection.disconnect ();
+       _film_audio_analysis_succeeded_connection.disconnect ();
        
        _film = f;
 
        try_to_load_analysis ();
-       setup_channels ();
        _plot->set_gain (_film->audio_gain ());
 
        _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
-       _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this));
+       _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
 
-       SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name()));
+       SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
-void
-AudioDialog::setup_channels ()
-{
-       if (!_film->audio_stream()) {
-               return;
-       }
-
-       AudioMapping m (_film->audio_stream()->channels ());
-       
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
-                       _channel_checkbox[i]->Show ();
-               } else {
-                       _channel_checkbox[i]->Hide ();
-               }
-       }
-}      
 
 void
 AudioDialog::try_to_load_analysis ()
@@ -124,12 +116,8 @@ AudioDialog::try_to_load_analysis ()
                
        _plot->set_analysis (a);
 
-       AudioMapping m (_film->audio_stream()->channels ());
-       optional<libdcp::Channel> c = m.source_to_dcp (0);
-       if (c) {
-               _channel_checkbox[c.get()]->SetValue (true);
-               _plot->set_channel_visible (0, true);
-       }
+       _channel_checkbox[0]->SetValue (true);
+       _plot->set_channel_visible (0, true);
 
        for (int i = 0; i < AudioPoint::COUNT; ++i) {
                _type_checkbox[i]->SetValue (true);
@@ -147,11 +135,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
        assert (c < MAX_AUDIO_CHANNELS);
 
-       AudioMapping m (_film->audio_stream()->channels ());
-       optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
-       if (s) {
-               _plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
-       }
+       _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
 void
@@ -161,11 +145,6 @@ AudioDialog::film_changed (Film::Property p)
        case Film::AUDIO_GAIN:
                _plot->set_gain (_film->audio_gain ());
                break;
-       case Film::CONTENT_AUDIO_STREAM:
-       case Film::EXTERNAL_AUDIO:
-       case Film::USE_CONTENT_AUDIO:
-               setup_channels ();
-               break;
        default:
                break;
        }