X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=8c8692aa1acca5c8fc7f6a43d5abdffd0bac19bd;hb=53eea12d3e0d7925d5949de92859bc358ee0adcc;hp=f1c6e30f342c981f2dc307228e4929fdadc35e2a;hpb=a85c82137ec26124ebefccb4aeebb96a3cdb8a4c;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index f1c6e30f3..8c8692aa1 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -64,12 +64,12 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
 	Bind (wxEVT_MOTION,     boost::bind (&Timeline::mouse_moved, this, _1));
 	Bind (wxEVT_SIZE,       boost::bind (&Timeline::resized,     this));
 
-	playlist_changed ();
+	film_changed (Film::CONTENT);
 
 	SetMinSize (wxSize (640, tracks() * track_height() + 96));
 
-	_playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
-	_playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2));
+	_film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1));
+	_film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2));
 }
 
 void
@@ -90,24 +90,26 @@ Timeline::paint ()
 }
 
 void
-Timeline::playlist_changed ()
+Timeline::film_changed (Film::Property p)
 {
-	ensure_ui_thread ();
-	recreate_views ();
+	if (p == Film::CONTENT) {
+		ensure_ui_thread ();
+		recreate_views ();
+	}
 }
 
 void
 Timeline::recreate_views ()
 {
-	shared_ptr<const Film> fl = _film.lock ();
-	if (!fl) {
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
 		return;
 	}
 
 	_views.clear ();
 	_views.push_back (_time_axis_view);
 
-	ContentList content = fl->playlist()->content ();
+	ContentList content = film->content ();
 
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		if (dynamic_pointer_cast<VideoContent> (*i)) {
@@ -115,7 +117,7 @@ Timeline::recreate_views ()
 		}
 
 		shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (*i);
-		if (ac && !ac->audio_mapping().mapped_dcp_channels().empty ()) {
+		if (ac && !ac->audio_mapping().mapped_output_channels().empty ()) {
 			_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, *i)));
 		}
 
@@ -131,7 +133,7 @@ Timeline::recreate_views ()
 }
 
 void
-Timeline::playlist_content_changed (int property)
+Timeline::film_content_changed (int property)
 {
 	ensure_ui_thread ();
 
@@ -142,7 +144,7 @@ Timeline::playlist_content_changed (int property)
 			setup_pixels_per_second ();
 		}
 		Refresh ();
-	} else if (property == AudioContentProperty::AUDIO_MAPPING) {
+	} else if (property == AudioContentProperty::AUDIO_STREAMS) {
 		recreate_views ();
 	}
 }