summaryrefslogtreecommitdiff
path: root/src/wx/audio_dialog.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx/audio_dialog.cc')
-rw-r--r--src/wx/audio_dialog.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index b7384fd14..242d37b1e 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -20,7 +20,6 @@
#include <boost/filesystem.hpp>
#include "lib/audio_analysis.h"
#include "lib/film.h"
-#include "lib/playlist.h"
#include "audio_dialog.h"
#include "audio_plot.h"
#include "wx_util.h"
@@ -91,7 +90,6 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
_film_audio_analysis_succeeded_connection.disconnect ();
_film = f;
- _playlist = _film->playlist ();
try_to_load_analysis ();
setup_channels ();
@@ -106,11 +104,11 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
void
AudioDialog::setup_channels ()
{
- if (!_playlist->has_audio()) {
+ if (!_film->has_audio()) {
return;
}
- AudioMapping m (_playlist->audio_channels ());
+ AudioMapping m (_film->audio_channels ());
for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -136,7 +134,7 @@ AudioDialog::try_to_load_analysis ()
_plot->set_analysis (a);
- AudioMapping m (_playlist->audio_channels ());
+ AudioMapping m (_film->audio_channels ());
optional<libdcp::Channel> c = m.source_to_dcp (0);
if (c) {
_channel_checkbox[c.get()]->SetValue (true);
@@ -159,7 +157,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
assert (c < MAX_AUDIO_CHANNELS);
- AudioMapping m (_playlist->audio_channels ());
+ AudioMapping m (_film->audio_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 ());
@@ -174,7 +172,6 @@ AudioDialog::film_changed (Film::Property p)
_plot->set_gain (_film->audio_gain ());
break;
case Film::CONTENT:
- _playlist = _film->playlist ();
setup_channels ();
break;
default: