projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 7af770b5faecde87e39040f4f67e37a99d63562c..b532e74e3730989bb78124cc7a8cacf9e997dd86 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.
@@
-24,8
+24,6
@@
#include "lib/rect.h"
#include "lib/film.h"
#include <wx/wx.h>
#include "lib/rect.h"
#include "lib/film.h"
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
class Film;
#include <boost/signals2.hpp>
class Film;
@@
-34,20
+32,21
@@
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 *,
std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer
);
-
boost
::shared_ptr<const Film> film () const;
+
std
::shared_ptr<const Film> film () const;
void force_redraw (dcpomatic::Rect<int> const &);
int width () const;
void force_redraw (dcpomatic::Rect<int> const &);
int width () const;
- int
track_height
() const {
- return _
track_height
;
+ int
pixels_per_track
() const {
+ return _
pixels_per_track
;
}
boost::optional<double> pixels_per_second () const {
}
boost::optional<double> pixels_per_second () const {
@@
-68,12
+67,13
@@
public:
enum Tool {
SELECT,
enum Tool {
SELECT,
- ZOOM
+ ZOOM,
+ ZOOM_ALL,
+ SNAP,
+ SEQUENCE
};
};
- void set_tool (Tool t) {
- _tool = t;
- }
+ void tool_clicked (Tool t);
int tracks_y_offset () const;
int tracks_y_offset () const;
@@
-90,49
+90,56
@@
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 scrolled (wxScrollWinEvent& ev);
void clear_selection ();
void recreate_views ();
void setup_scrollbars ();
void scrolled (wxScrollWinEvent& ev);
+ 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 &);
+
std
::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
ContentList selected_content () const;
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;
wxScrolledCanvas* _labels_canvas;
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
- boost::weak_ptr<Film> _film;
+ std::weak_ptr<Film> _film;
+ std::weak_ptr<FilmViewer> _viewer;
TimelineViewList _views;
TimelineViewList _views;
-
boost
::shared_ptr<TimelineTimeAxisView> _time_axis_view;
-
boost
::shared_ptr<TimelineReelsView> _reels_view;
-
boost
::shared_ptr<TimelineLabelsView> _labels_view;
+
std
::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+
std
::shared_ptr<TimelineReelsView> _reels_view;
+
std
::shared_ptr<TimelineLabelsView> _labels_view;
int _tracks;
boost::optional<double> _pixels_per_second;
bool _left_down;
wxPoint _down_point;
boost::optional<wxPoint> _zoom_point;
int _tracks;
boost::optional<double> _pixels_per_second;
bool _left_down;
wxPoint _down_point;
boost::optional<wxPoint> _zoom_point;
-
boost
::shared_ptr<TimelineContentView> _down_view;
- DCPTime _down_view_position;
+
std
::shared_ptr<TimelineContentView> _down_view;
+
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;
- int _track_height;
+ int _pixels_per_track;
+ bool _first_resize;
+ wxTimer _timer;
static double const _minimum_pixels_per_second;
static double const _minimum_pixels_per_second;
- static int const _minimum_
track_height
;
+ static int const _minimum_
pixels_per_track
;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _film_changed_connection;
- boost::signals2::scoped_connection _film_content_change
d
_connection;
+ boost::signals2::scoped_connection _film_content_change_connection;
};
};