projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 2133a537dc72b3f76faacc3c3435224b8b65c273..84cb870f24209f6d055d84a490ac9848d2c5b096 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-69,7
+69,9
@@
public:
enum Tool {
SELECT,
ZOOM,
enum Tool {
SELECT,
ZOOM,
- ZOOM_ALL
+ ZOOM_ALL,
+ SNAP,
+ SEQUENCE
};
void tool_clicked (Tool t);
};
void tool_clicked (Tool t);
@@
-89,11
+91,11
@@
private:
void mouse_moved (wxMouseEvent &);
void mouse_moved_select (wxMouseEvent &);
void mouse_moved_zoom (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
void mouse_moved_select (wxMouseEvent &);
void mouse_moved_zoom (wxMouseEvent &);
- void film_change
d (
Film::Property);
- void film_content_change
d (
int, bool frequent);
+ void film_change
(ChangeType type,
Film::Property);
+ void film_content_change
(ChangeType type,
int, bool frequent);
void resized ();
void assign_tracks ();
void resized ();
void assign_tracks ();
- void set_position_from_event (wxMouseEvent
&
);
+ void set_position_from_event (wxMouseEvent
& ev, bool force_emit = false
);
void clear_selection ();
void recreate_views ();
void setup_scrollbars ();
void clear_selection ();
void recreate_views ();
void setup_scrollbars ();
@@
-105,7
+107,7
@@
private:
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
ContentList selected_content () const;
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
ContentList selected_content () const;
- void maybe_snap (
DCPTime a, DCPTime b, boost::optional<
DCPTime>& nearest_distance) const;
+ void maybe_snap (
dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::
DCPTime>& nearest_distance) const;
wxScrolledCanvas* _labels_canvas;
wxScrolledCanvas* _main_canvas;
wxScrolledCanvas* _labels_canvas;
wxScrolledCanvas* _main_canvas;
@@
-121,12
+123,12
@@
private:
wxPoint _down_point;
boost::optional<wxPoint> _zoom_point;
boost::shared_ptr<TimelineContentView> _down_view;
wxPoint _down_point;
boost::optional<wxPoint> _zoom_point;
boost::shared_ptr<TimelineContentView> _down_view;
- DCPTime _down_view_position;
+
dcpomatic::
DCPTime _down_view_position;
bool _first_move;
ContentMenu _menu;
bool _snap;
bool _first_move;
ContentMenu _menu;
bool _snap;
- std::list<DCPTime> _start_snaps;
- std::list<DCPTime> _end_snaps;
+ std::list<
dcpomatic::
DCPTime> _start_snaps;
+ std::list<
dcpomatic::
DCPTime> _end_snaps;
Tool _tool;
int _x_scroll_rate;
int _y_scroll_rate;
Tool _tool;
int _x_scroll_rate;
int _y_scroll_rate;
@@
-137,5
+139,5
@@
private:
static int const _minimum_pixels_per_track;
boost::signals2::scoped_connection _film_changed_connection;
static int const _minimum_pixels_per_track;
boost::signals2::scoped_connection _film_changed_connection;
- boost::signals2::scoped_connection _film_content_change
d
_connection;
+ boost::signals2::scoped_connection _film_content_change_connection;
};
};