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 b3ee77fff84644a14eb2158ab38fd64778b19a6d..82d10afde6cc8a8337c910b8b9506c1461c96585 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-28,13
+28,13
@@
class Film;
class View;
class ContentView;
class Film;
class View;
class ContentView;
-class
FilmEditor
;
-class
DCP
TimeAxisView;
+class
ContentPanel
;
+class TimeAxisView;
-class
DCP
Timeline : public wxPanel
+class Timeline : public wxPanel
{
public:
{
public:
-
DCPTimeline (wxWindow *, FilmEditor
*, boost::shared_ptr<Film>);
+
Timeline (wxWindow *, ContentPanel
*, boost::shared_ptr<Film>);
boost::shared_ptr<const Film> film () const;
boost::shared_ptr<const Film> film () const;
@@
-52,8
+52,8
@@
public:
return 48;
}
return 48;
}
-
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 &);
@@
-91,12
+92,12
@@
private:
ContentViewList selected_views () const;
ContentList selected_content () const;
ContentViewList selected_views () const;
ContentList selected_content () const;
-
FilmEditor* _film_editor
;
+
ContentPanel* _content_panel
;
boost::weak_ptr<Film> _film;
ViewList _views;
boost::weak_ptr<Film> _film;
ViewList _views;
- boost::shared_ptr<
DCP
TimeAxisView> _time_axis_view;
+ boost::shared_ptr<TimeAxisView> _time_axis_view;
int _tracks;
int _tracks;
-
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;
@@
-105,5
+106,6
@@
private:
ContentMenu _menu;
bool _snap;
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;
};
};