projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index b64445d9cf88447a8b5638f1d579641864700879..802aaf245acfedf2576b38c7b456c7d1eb1114c8 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-24,14
+24,18
@@
class Playlist;
class Playlist;
-class
DCP
TimelineDialog : public wxDialog
+class TimelineDialog : public wxDialog
{
public:
{
public:
-
DCPTimelineDialog (FilmEditor
*, boost::shared_ptr<Film>);
+
TimelineDialog (ContentPanel
*, boost::shared_ptr<Film>);
private:
void snap_toggled ();
private:
void snap_toggled ();
+ void sequence_video_toggled ();
+ void film_changed (Film::Property);
- DCPTimeline _timeline;
+ boost::weak_ptr<Film> _film;
+ Timeline _timeline;
wxCheckBox* _snap;
wxCheckBox* _snap;
+ wxCheckBox* _sequence_video;
};
};