summaryrefslogtreecommitdiff
path: root/src/wx/timeline.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-25 22:24:39 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-25 22:24:39 +0000
commit07789030fb4ec7d48d14c2cbee0b32f616d6d93d (patch)
tree2792b02fbcd1e443708e369bc34d2dd7a9c13db4 /src/wx/timeline.h
parentd2e8a683eed6fb82d4d255fffaf571ff27057132 (diff)
Basics of timeline track labels.
Diffstat (limited to 'src/wx/timeline.h')
-rw-r--r--src/wx/timeline.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index c0a18ab0d..519f00afb 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -32,6 +32,7 @@ class ContentPanel;
class TimelineView;
class TimelineTimeAxisView;
class TimelineReelsView;
+class TimelineLabelsView;
class Timeline : public wxPanel
{
@@ -42,10 +43,6 @@ public:
void force_redraw (dcpomatic::Rect<int> const &);
- int x_offset () const {
- return 8;
- }
-
int width () const {
return GetSize().GetWidth ();
}
@@ -59,7 +56,7 @@ public:
}
Position<int> tracks_position () const {
- return Position<int> (8, 8);
+ return _tracks_position;
}
int tracks () const;
@@ -100,6 +97,7 @@ private:
TimelineViewList _views;
boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
boost::shared_ptr<TimelineReelsView> _reels_view;
+ boost::shared_ptr<TimelineLabelsView> _labels_view;
int _tracks;
boost::optional<double> _pixels_per_second;
bool _left_down;
@@ -111,6 +109,7 @@ private:
bool _snap;
std::list<DCPTime> _start_snaps;
std::list<DCPTime> _end_snaps;
+ Position<int> _tracks_position;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _film_content_changed_connection;