Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / wx / timeline.h

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index c0a18ab0dd107065be62902aae3e40458f28771d..c8424541eb8eb226a7cd0b6e707107df901cbf4c 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -32,6 +33,7 @@ class ContentPanel;
 class TimelineView;
 class TimelineTimeAxisView;
 class TimelineReelsView;
+class TimelineLabelsView;
 
 class Timeline : public wxPanel
 {
@@ -42,10 +44,6 @@ public:
 
        void force_redraw (dcpomatic::Rect<int> const &);
 
-       int x_offset () const {
-               return 8;
-       }
-
        int width () const {
                return GetSize().GetWidth ();
        }
@@ -59,7 +57,7 @@ public:
        }
 
        Position<int> tracks_position () const {
-               return Position<int> (8, 8);
+               return _tracks_position;
        }
 
        int tracks () const;
@@ -100,6 +98,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 +110,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;