Merge master.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 39650d15718de466e8e5847ef93a4e1b766b2c9e..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;
@@ -84,7 +84,7 @@ 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_succeeded_connection.disconnect ();
@@ -92,7 +92,6 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
        _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));
@@ -101,23 +100,6 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
        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 ()
@@ -134,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);
@@ -157,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
@@ -171,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;
        }