Merge master.

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

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 0e713d1deaf07fc3c726fb1f286dfa8d80d0a6e2..185abefeb8b5e6c1041c937d02f491c9de00ea3f 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -64,9 +64,9 @@ public:
 protected:
        virtual void do_paint (wxGraphicsContext *) = 0;
        
-       int time_x (double t) const
+       int time_x (DCPTime t) const
        {
-               return _timeline.tracks_position().x + t * _timeline.pixels_per_second ();
+               return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second ();
        }
        
        Timeline& _timeline;
@@ -83,7 +83,6 @@ public:
        ContentView (Timeline& tl, shared_ptr<Content> c)
                : View (tl)
                , _content (c)
-               , _track (0)
                , _selected (false)
        {
                _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
@@ -91,6 +90,8 @@ public:
 
        dcpomatic::Rect<int> bbox () const
        {
+               assert (_track);
+
                shared_ptr<const Film> film = _timeline.film ();
                shared_ptr<const Content> content = _content.lock ();
                if (!film || !content) {
@@ -99,7 +100,7 @@ public:
                
                return dcpomatic::Rect<int> (
                        time_x (content->position ()) - 8,
-                       y_pos (_track) - 8,
+                       y_pos (_track.get()) - 8,
                        content->length_after_trim().seconds() * _timeline.pixels_per_second() + 16,
                        _timeline.track_height() + 16
                        );
@@ -122,7 +123,7 @@ public:
                _track = t;
        }
 
-       int track () const {
+       optional<int> track () const {
                return _track;
        }
 
@@ -133,6 +134,8 @@ private:
 
        void do_paint (wxGraphicsContext* gc)
        {
+               assert (_track);
+
                shared_ptr<const Film> film = _timeline.film ();
                shared_ptr<const Content> cont = content ();
                if (!film || !cont) {
@@ -154,11 +157,11 @@ private:
                }
 
                wxGraphicsPath path = gc->CreatePath ();
-               path.MoveToPoint    (time_x (position),       y_pos (_track) + 4);
-               path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4);
-               path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (position),       y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (position),       y_pos (_track) + 4);
+               path.MoveToPoint    (time_x (position),       y_pos (_track.get()) + 4);
+               path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4);
+               path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4);
+               path.AddLineToPoint (time_x (position),       y_pos (_track.get() + 1) - 4);
+               path.AddLineToPoint (time_x (position),       y_pos (_track.get()) + 4);
                gc->StrokePath (path);
                gc->FillPath (path);
 
@@ -169,8 +172,8 @@ private:
                wxDouble name_leading;
                gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
                
-               gc->Clip (wxRegion (time_x (position), y_pos (_track), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
-               gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4);
+               gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
+               gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
                gc->ResetClip ();
        }
 
@@ -194,7 +197,7 @@ private:
        }
 
        boost::weak_ptr<Content> _content;
-       int _track;
+       optional<int> _track;
        bool _selected;
 
        boost::signals2::scoped_connection _content_connection;
@@ -243,6 +246,25 @@ private:
        }
 };
 
+class SubtitleContentView : public ContentView
+{
+public:
+       SubtitleContentView (Timeline& tl, shared_ptr<Content> c)
+               : ContentView (tl, c)
+       {}
+
+private:
+       wxString type () const
+       {
+               return _("subtitles");
+       }
+
+       wxColour colour () const
+       {
+               return wxColour (163, 255, 154, 255);
+       }
+};
+
 class TimeAxisView : public View
 {
 public:
@@ -292,14 +314,14 @@ private:
                gc->StrokePath (path);
 
                /* Time in seconds */
-               double t;
-               while ((t * _timeline.pixels_per_second()) < _timeline.width()) {
+               DCPTime t;
+               while ((t.seconds() * _timeline.pixels_per_second()) < _timeline.width()) {
                        wxGraphicsPath path = gc->CreatePath ();
                        path.MoveToPoint (time_x (t), _y - 4);
                        path.AddLineToPoint (time_x (t), _y + 4);
                        gc->StrokePath (path);
 
-                       double tc = t;
+                       double tc = t.seconds ();
                        int const h = tc / 3600;
                        tc -= h * 3600;
                        int const m = tc / 60;
@@ -313,12 +335,12 @@ private:
                        wxDouble str_leading;
                        gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
                        
-                       int const tx = _timeline.x_offset() + t * _timeline.pixels_per_second();
+                       int const tx = _timeline.x_offset() + t.seconds() * _timeline.pixels_per_second();
                        if ((tx + str_width) < _timeline.width()) {
                                gc->DrawText (str, time_x (t), _y + 16);
                        }
                        
-                       t += mark_interval;
+                       t += DCPTime::from_seconds (mark_interval);
                }
        }
 
@@ -399,6 +421,9 @@ Timeline::playlist_changed ()
                if (dynamic_pointer_cast<AudioContent> (*i)) {
                        _views.push_back (shared_ptr<View> (new AudioContentView (*this, *i)));
                }
+               if (dynamic_pointer_cast<SubtitleContent> (*i)) {
+                       _views.push_back (shared_ptr<View> (new SubtitleContentView (*this, *i)));
+               }
        }
 
        assign_tracks ();
@@ -411,25 +436,17 @@ Timeline::assign_tracks ()
 {
        for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
                shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
-               if (cv) {
-                       cv->set_track (0);
-                       _tracks = 1;
-               }
-       }
-
-       for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-               shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
-               if (!acv) {
+               if (!cv) {
                        continue;
                }
-       
-               shared_ptr<Content> acv_content = acv->content();
 
-               int t = 1;
-               while (1) {
+               shared_ptr<Content> content = cv->content();
+
+               int t = 0;
+               while (true) {
                        ViewList::iterator j = _views.begin();
                        while (j != _views.end()) {
-                               shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
+                               shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
                                if (!test) {
                                        ++j;
                                        continue;
@@ -437,10 +454,10 @@ Timeline::assign_tracks ()
                                
                                shared_ptr<Content> test_content = test->content();
                                        
-                               if (test && test->track() == t) {
+                               if (test && test->track() && test->track().get() == t) {
                                        bool const no_overlap =
-                                               (acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) ||
-                                               (acv_content->position() > test_content->end()      && acv_content->end() > test_content->end());
+                                               (content->position() < test_content->position() && content->end() < test_content->position()) ||
+                                               (content->position() > test_content->end()      && content->end() > test_content->end());
                                        
                                        if (!no_overlap) {
                                                /* we have an overlap on track `t' */
@@ -458,7 +475,7 @@ Timeline::assign_tracks ()
                        }
                }
 
-               acv->set_track (t);
+               cv->set_track (t);
                _tracks = max (_tracks, t + 1);
        }
 
@@ -475,7 +492,7 @@ void
 Timeline::setup_pixels_per_second ()
 {
        shared_ptr<const Film> film = _film.lock ();
-       if (!film || film->length() == 0) {
+       if (!film || film->length() == DCPTime ()) {
                return;
        }
 
@@ -639,13 +656,13 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                
                if (!first) {
                        /* Snap if it's close; `close' means within a proportion of the time on the timeline */
-                       if (nearest_distance < (width() / pixels_per_second()) / 32) {
+                       if (nearest_distance < DCPTime::from_seconds ((width() / pixels_per_second()) / 32)) {
                                new_position = nearest_new_position;
                        }
                }
        }
        
-       if (new_position < 0) {
+       if (new_position < DCPTime ()) {
                new_position = DCPTime ();
        }