Merge master.

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

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index bc6b83eb56810bd6c3e964afed150df34de5af96..b64445d9cf88447a8b5638f1d579641864700879 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -24,11 +24,14 @@
 
 class Playlist;
 
-class TimelineDialog : public wxDialog
+class DCPTimelineDialog : public wxDialog
 {
 public:
-       TimelineDialog (wxWindow *, boost::shared_ptr<const Film>);
+       DCPTimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
 
 private:
-       Timeline _timeline;
+       void snap_toggled ();
+       
+       DCPTimeline _timeline;
+       wxCheckBox* _snap;
 };