projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to copy the data and hook it up to a menu item.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index a7f34586305875dc6ce14261d2a9949d3d540505..44a8973716bdd3dca7f3df7fe761f5fd1a019f40 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-34,11
+34,12
@@
class TimelineView;
class TimelineTimeAxisView;
class TimelineReelsView;
class TimelineLabelsView;
class TimelineTimeAxisView;
class TimelineReelsView;
class TimelineLabelsView;
+class FilmViewer;
class Timeline : public wxPanel
{
public:
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
+ Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>
, boost::weak_ptr<FilmViewer> viewer
);
boost::shared_ptr<const Film> film () const;
boost::shared_ptr<const Film> film () const;
@@
-103,16
+104,18
@@
private:
void set_pixels_per_second (double pps);
void set_pixels_per_track (int h);
void zoom_all ();
void set_pixels_per_second (double pps);
void set_pixels_per_track (int h);
void zoom_all ();
+ void update_playhead ();
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;
ContentPanel* _content_panel;
boost::weak_ptr<Film> _film;
wxScrolledCanvas* _labels_canvas;
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
boost::weak_ptr<Film> _film;
+ boost::weak_ptr<FilmViewer> _viewer;
TimelineViewList _views;
boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
boost::shared_ptr<TimelineReelsView> _reels_view;
TimelineViewList _views;
boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
boost::shared_ptr<TimelineReelsView> _reels_view;
@@
-123,17
+126,18
@@
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;
int _pixels_per_track;
bool _first_resize;
Tool _tool;
int _x_scroll_rate;
int _y_scroll_rate;
int _pixels_per_track;
bool _first_resize;
+ wxTimer _timer;
static double const _minimum_pixels_per_second;
static int const _minimum_pixels_per_track;
static double const _minimum_pixels_per_second;
static int const _minimum_pixels_per_track;