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.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 7b4d75d091d7397e37be13476264977133402206..8f23f68941e6428a834910ac7dd988d813f6adb5 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-52,8
+52,8
@@
public:
return 48;
}
return 48;
}
- boost::optional<double> pixels_per_
time_unit
() const {
- return _pixels_per_
time_unit
;
+ boost::optional<double> pixels_per_
second
() const {
+ return _pixels_per_
second
;
}
Position<int> tracks_position () const {
}
Position<int> tracks_position () const {
@@
-62,7
+62,7
@@
public:
int tracks () const;
int tracks () const;
- void setup_pixels_per_
time_unit
();
+ void setup_pixels_per_
second
();
void set_snap (bool s) {
_snap = s;
void set_snap (bool s) {
_snap = s;
@@
-79,6
+79,7
@@
private:
void right_down (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
void playlist_changed ();
void right_down (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
void playlist_changed ();
+ void playlist_content_changed (int);
void resized ();
void assign_tracks ();
void set_position_from_event (wxMouseEvent &);
void resized ();
void assign_tracks ();
void set_position_from_event (wxMouseEvent &);
@@
-96,14
+97,15
@@
private:
ViewList _views;
boost::shared_ptr<TimeAxisView> _time_axis_view;
int _tracks;
ViewList _views;
boost::shared_ptr<TimeAxisView> _time_axis_view;
int _tracks;
- boost::optional<double> _pixels_per_
time_unit
;
+ boost::optional<double> _pixels_per_
second
;
bool _left_down;
wxPoint _down_point;
boost::shared_ptr<ContentView> _down_view;
bool _left_down;
wxPoint _down_point;
boost::shared_ptr<ContentView> _down_view;
- Time _down_view_position;
+
DCP
Time _down_view_position;
bool _first_move;
ContentMenu _menu;
bool _snap;
bool _first_move;
ContentMenu _menu;
bool _snap;
- boost::signals2::scoped_connection _playlist_connection;
+ boost::signals2::scoped_connection _playlist_changed_connection;
+ boost::signals2::scoped_connection _playlist_content_changed_connection;
};
};