Various fixes to make audio analysis sort-of work.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 11efc153c69c13e8c5a38c2d7f1395c4b2f17458..ea7cc60dd0d135044ce8acc94c452bcc5fc8ffa0 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -17,63 +17,149 @@
 
 */
 
+#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, boost::shared_ptr<Film> film)
-       : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+AudioDialog::AudioDialog (wxWindow* parent)
+       : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
        , _plot (0)
 {
        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);
+       }
 
-       sizer->Add (table);
+       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);
+       }
 
-       set_film (film);
+       {
+               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);
+       }
+
+       {
+               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);
+}
+
+void
+AudioDialog::set_content (shared_ptr<AudioContent> c)
+{
+       _content_changed_connection.disconnect ();
+       
+       _content = c;
+
+       try_to_load_analysis ();
+       _plot->set_gain (_content->audio_gain ());
 
-       _channel->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioDialog::channel_changed), 0, this);
+       _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
+
+       SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->file().filename().string()).data()));
 }
 
+
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::try_to_load_analysis ()
 {
        shared_ptr<AudioAnalysis> a;
 
-       try {
-               a.reset (new AudioAnalysis (f->audio_analysis_path ()));
-       } catch (...) {
-
+       if (boost::filesystem::exists (_content->audio_analysis_path())) {
+               a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
+       } else {
+               if (IsShown ()) {
+                       _content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this));
+               }
        }
                
        _plot->set_analysis (a);
 
-       _channel->Clear ();
-       for (int i = 0; i < f->audio_stream()->channels(); ++i) {
-               _channel->Append (audio_channel_name (i));
+       if (_channel_checkbox[0]) {
+               _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_clicked (wxCommandEvent& ev)
+{
+       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
+AudioDialog::content_changed (int p)
+{
+       if (p == AudioContentProperty::AUDIO_GAIN) {
+               _plot->set_gain (_content->audio_gain ());
+       }
+}
+
+void
+AudioDialog::type_clicked (wxCommandEvent& ev)
+{
+       int t = 0;
+       while (t < AudioPoint::COUNT && ev.GetEventObject() != _type_checkbox[t]) {
+               ++t;
+       }
+
+       assert (t < AudioPoint::COUNT);
 
-       _channel->SetSelection (0);
+       _plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
 }
 
 void
-AudioDialog::channel_changed (wxCommandEvent &)
+AudioDialog::smoothing_changed (wxScrollEvent &)
 {
-       _plot->set_channel (_channel->GetSelection ());
+       _plot->set_smoothing (_smoothing->GetValue ());
 }