Merge master.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 74586fa132584f0c52ba51f661358066cef8c875..22e09cc7a8c1988973c21011a2027f064803ad38 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;
@@ -29,13 +29,13 @@ using boost::bind;
 using boost::optional;
 
 AudioDialog::AudioDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+       : 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, wxALL, 12);
+       sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
        wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
 
@@ -43,7 +43,6 @@ AudioDialog::AudioDialog (wxWindow* parent)
                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)));
@@ -84,62 +83,39 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_content (shared_ptr<AudioContent> c)
 {
-       _film_changed_connection.disconnect ();
-       _film_audio_analysis_finished_connection.disconnect ();
+       _content_changed_connection.disconnect ();
        
-       _film = f;
+       _content = c;
 
        try_to_load_analysis ();
-       setup_channels ();
-       _plot->set_gain (_film->audio_gain ());
+       _plot->set_gain (_content->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));
+       _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
 
-       SetTitle (std_to_wx (String::compose ("DVD-o-matic audio - %1", _film->name())));
+       SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->file().filename().string()).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 ()
 {
        shared_ptr<AudioAnalysis> a;
 
-       if (boost::filesystem::exists (_film->audio_analysis_path())) {
-               a.reset (new AudioAnalysis (_film->audio_analysis_path ()));
+       if (boost::filesystem::exists (_content->audio_analysis_path())) {
+               a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
        } else {
                if (IsShown ()) {
-                       _film->analyse_audio ();
+                       _content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this));
                }
        }
                
        _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);
+       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);
@@ -157,27 +133,14 @@ 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
-AudioDialog::film_changed (Film::Property p)
+AudioDialog::content_changed (int p)
 {
-       switch (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;
+       if (p == AudioContentProperty::AUDIO_GAIN) {
+               _plot->set_gain (_content->audio_gain ());
        }
 }