Add a PlaylistOrderChanged signal and emit it when the playlist

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

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 4f0eef0e12358286aa8eefee285bff8e878bc9d7..8a61eccb07e39b3736fa527f313079fd80b46018 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -17,20 +17,25 @@
 
 */
 
-#include <list>
-#include <wx/graphics.h>
-#include <boost/weak_ptr.hpp>
-#include "lib/film.h"
-#include "lib/playlist.h"
-#include "lib/image_content.h"
 #include "film_editor.h"
 #include "timeline.h"
 #include "timeline_time_axis_view.h"
+#include "timeline_reels_view.h"
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
 #include "timeline_subtitle_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
+#include "lib/image_content.h"
+#include "lib/audio_content.h"
+#include "lib/subtitle_content.h"
+#include <wx/graphics.h>
+#include <boost/weak_ptr.hpp>
+#include <boost/foreach.hpp>
+#include <list>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -45,7 +50,8 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
        : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
        , _content_panel (cp)
        , _film (film)
-       , _time_axis_view (new TimelineTimeAxisView (*this, 32))
+       , _time_axis_view (new TimelineTimeAxisView (*this, 64))
+       , _reels_view (new TimelineReelsView (*this, 32))
        , _tracks (0)
        , _left_down (false)
        , _down_view_position (0)
@@ -92,9 +98,16 @@ Timeline::paint ()
 void
 Timeline::film_changed (Film::Property p)
 {
-       if (p == Film::CONTENT) {
+       if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) {
                ensure_ui_thread ();
                recreate_views ();
+       } else if (p == Film::CONTENT_ORDER) {
+               assign_tracks ();
+               if (!_left_down) {
+                       /* Only do this if we are not dragging, as it's confusing otherwise */
+                       setup_pixels_per_second ();
+               }
+               Refresh ();
        }
 }
 
@@ -108,20 +121,19 @@ Timeline::recreate_views ()
 
        _views.clear ();
        _views.push_back (_time_axis_view);
+       _views.push_back (_reels_view);
 
-       ContentList content = film->content ();
-
-       for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
-               if (dynamic_pointer_cast<VideoContent> (*i)) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, *i)));
+       BOOST_FOREACH (shared_ptr<Content> i, film->content ()) {
+               if (dynamic_pointer_cast<VideoContent> (i)) {
+                       _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
                }
 
-               shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (*i);
+               shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i);
                if (ac && !ac->audio_mapping().mapped_output_channels().empty ()) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, *i)));
+                       _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
                }
 
-               shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (*i);
+               shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (i);
                if (sc && sc->has_subtitles ()) {
                        _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, sc)));
                }
@@ -137,14 +149,7 @@ Timeline::film_content_changed (int property)
 {
        ensure_ui_thread ();
 
-       if (property == ContentProperty::POSITION) {
-               assign_tracks ();
-               if (!_left_down) {
-                       /* Only do this if we are not dragging, as it's confusing otherwise */
-                       setup_pixels_per_second ();
-               }
-               Refresh ();
-       } else if (property == AudioContentProperty::AUDIO_STREAMS) {
+       if (property == AudioContentProperty::AUDIO_STREAMS) {
                recreate_views ();
        }
 }
@@ -166,6 +171,7 @@ Timeline::assign_tracks ()
                }
 
                shared_ptr<Content> content = cv->content();
+               DCPTimePeriod content_period (content->position(), content->end());
 
                int t = 0;
                while (true) {
@@ -180,11 +186,7 @@ Timeline::assign_tracks ()
                                shared_ptr<Content> test_content = test->content();
 
                                if (test && test->track() && test->track().get() == t) {
-                                       bool const no_overlap =
-                                               (content->position() < test_content->position() && content->end() < test_content->position()) ||
-                                               (content->position() > test_content->end()      && content->end() > test_content->end());
-
-                                       if (!no_overlap) {
+                                       if (content_period.overlaps (DCPTimePeriod(test_content->position(), test_content->end()))) {
                                                /* we have an overlap on track `t' */
                                                ++t;
                                                break;
@@ -204,7 +206,8 @@ Timeline::assign_tracks ()
                _tracks = max (_tracks, t + 1);
        }
 
-       _time_axis_view->set_y (tracks() * track_height() + 32);
+       _time_axis_view->set_y (tracks() * track_height() + 64);
+       _reels_view->set_y (tracks() * track_height() + 32);
 }
 
 int
@@ -365,7 +368,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 
        if (_snap) {
 
-               DCPTime const new_end = new_position + _down_view->content()->length_after_trim () - DCPTime (1);
+               DCPTime const new_end = new_position + _down_view->content()->length_after_trim();
                /* Signed `distance' to nearest thing (i.e. negative is left on the timeline,
                   positive is right).
                */
@@ -379,9 +382,9 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                        }
 
                        maybe_snap (cv->content()->position(), new_position, nearest_distance);
-                       maybe_snap (cv->content()->position(), new_end + DCPTime (1), nearest_distance);
-                       maybe_snap (cv->content()->end() + DCPTime (1), new_position, nearest_distance);
-                       maybe_snap (cv->content()->end() + DCPTime (1), new_end, nearest_distance);
+                       maybe_snap (cv->content()->position(), new_end, nearest_distance);
+                       maybe_snap (cv->content()->end(), new_position, nearest_distance);
+                       maybe_snap (cv->content()->end(), new_end, nearest_distance);
                }
 
                if (nearest_distance) {