Merge master.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 89b04409a816d90899c6209844da93a094280fa6..bfd92f0b65e8db97508cb61ee775e75121086662 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -18,14 +18,15 @@
 */
 
 #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;
 using boost::bind;
+using boost::optional;
 
 AudioDialog::AudioDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
@@ -34,53 +35,71 @@ AudioDialog::AudioDialog (wxWindow* parent)
        wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _plot = new AudioPlot (this);
-       sizer->Add (_plot, 1);
+       sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
 
-       add_label_to_sizer (table, this, _("Channel"));
-       _channel = new wxChoice (this, wxID_ANY);
-       table->Add (_channel, 1, wxEXPAND | wxALL, 6);
+       {
+               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, 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);
+       }
+
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
+       wxString const types[] = {
+               _("Peak"),
+               _("RMS")
+       };
+
+       for (int i = 0; i < AudioPoint::COUNT; ++i) {
+               _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
+               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);
+       }
 
-       sizer->Add (table);
+       {
+               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);
+       side->Add (_smoothing, 1, wxEXPAND);
+
+       sizer->Add (side, 0, wxALL, 12);
 
        SetSizer (sizer);
        sizer->Layout ();
        sizer->SetSizeHints (this);
-
-       _channel->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioDialog::channel_changed), 0, this);
 }
 
 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 ();
-
-       _channel->SetSelection (0);
+       _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));
 
-void
-AudioDialog::setup_channels ()
-{
-       _channel->Clear ();
+       SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+}
 
-       if (!_film->audio_stream()) {
-               return;
-       }
-       
-       for (int i = 0; i < _film->audio_stream()->channels(); ++i) {
-               _channel->Append (audio_channel_name (i));
-       }
-}      
 
 void
 AudioDialog::try_to_load_analysis ()
@@ -96,12 +115,27 @@ AudioDialog::try_to_load_analysis ()
        }
                
        _plot->set_analysis (a);
+
+       _channel_checkbox[0]->SetValue (true);
+       _plot->set_channel_visible (0, true);
+
+       for (int i = 0; i < AudioPoint::COUNT; ++i) {
+               _type_checkbox[i]->SetValue (true);
+               _plot->set_type_visible (i, true);
+       }
 }
 
 void
-AudioDialog::channel_changed (wxCommandEvent &)
+AudioDialog::channel_clicked (wxCommandEvent& ev)
 {
-       _plot->set_channel (_channel->GetSelection ());
+       int c = 0;
+       while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+               ++c;
+       }
+
+       assert (c < MAX_AUDIO_CHANNELS);
+
+       _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
 void
@@ -111,12 +145,26 @@ 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;
        }
 }
+
+void
+AudioDialog::type_clicked (wxCommandEvent& ev)
+{
+       int t = 0;
+       while (t < AudioPoint::COUNT && ev.GetEventObject() != _type_checkbox[t]) {
+               ++t;
+       }
+
+       assert (t < AudioPoint::COUNT);
+
+       _plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
+}
+
+void
+AudioDialog::smoothing_changed (wxScrollEvent &)
+{
+       _plot->set_smoothing (_smoothing->GetValue ());
+}