Merge master.

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

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index e58de554072fc9e5115a9f6f77024eb629ad93cd..1e595500303b5b964b0ba54157c67d47f260625b 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -27,8 +27,11 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-       TimelineDialog (wxWindow *, boost::shared_ptr<Playlist>);
+       TimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
 
 private:
+       void snap_toggled ();
+       
        Timeline _timeline;
+       wxCheckBox* _snap;
 };