Final tweaks and removal of Film::playlist().

1 files changed, 10 insertions, 9 deletions

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index cab0ea0e0..2afd0d194 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -17,14 +17,15 @@
 
 */
 
+#include "content_menu.h"
+#include "timeline_content_view.h"
+#include "lib/util.h"
+#include "lib/rect.h"
+#include "lib/film.h"
+#include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
-#include <wx/wx.h>
-#include "lib/util.h"
-#include "lib/rect.h"
-#include "content_menu.h"
-#include "timeline_content_view.h"
 
 class Film;
 class ContentPanel;
@@ -78,8 +79,8 @@ private:
 	void left_up (wxMouseEvent &);
 	void right_down (wxMouseEvent &);
 	void mouse_moved (wxMouseEvent &);
-	void playlist_changed ();
-	void playlist_content_changed (int);
+	void film_changed (Film::Property);
+	void film_content_changed (int);
 	void resized ();
 	void assign_tracks ();
 	void set_position_from_event (wxMouseEvent &);
@@ -105,6 +106,6 @@ private:
 	ContentMenu _menu;
 	bool _snap;
 
-	boost::signals2::scoped_connection _playlist_changed_connection;
-	boost::signals2::scoped_connection _playlist_content_changed_connection;
+	boost::signals2::scoped_connection _film_changed_connection;
+	boost::signals2::scoped_connection _film_content_changed_connection;
 };