Merge master.

[dcpomatic.git] / src / wx / timing_panel.h

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index d9696a20135671a711fe27a14bc2bd5565df237a..b531db5512ed3974da1ed253878cc45dbe7d86d5 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -17,14 +17,14 @@
 
 */
 
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 
 class Timecode;
 
-class TimingPanel : public FilmEditorPanel
+class TimingPanel : public ContentSubPanel
 {
 public:
-       TimingPanel (FilmEditor *);
+       TimingPanel (ContentPanel *);
 
        void film_content_changed (int);
        void content_selection_changed ();