From 931fa4ef2dbfb7c9f726c4dd41eea79621b49906 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Apr 2014 11:34:56 +0100 Subject: [PATCH 1/1] Don't overlap simultaneous video content in the timeline. Fix keep-aligned for separate-eye sources. --- src/lib/player.cc | 2 +- src/lib/player.h | 2 +- src/lib/playlist.cc | 19 +++++++++++------ src/wx/timeline.cc | 51 ++++++++++++++++++++------------------------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index d05597dd5..c4558f33f 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 diff --git a/src/lib/player.h b/src/lib/player.h index 11cc99e77..f7896d7d9 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 608323e3b..a2bec83bb 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -64,7 +64,7 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH) { + if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { maybe_sequence_video (); } @@ -81,14 +81,21 @@ Playlist::maybe_sequence_video () _sequencing_video = true; ContentList cl = _content; - Time next = 0; + Time next_left = 0; + Time next_right = 0; for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { + shared_ptr vc = dynamic_pointer_cast (*i); + if (!vc) { continue; } - - (*i)->set_position (next); - next = (*i)->end() + 1; + + if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + vc->set_position (next_right); + next_right = vc->end() + 1; + } else { + vc->set_position (next_left); + next_left = vc->end() + 1; + } } /* This won't change order, so it does not need a sort */ diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 4e306c499..1858afee7 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 @@ -83,7 +83,6 @@ public: ContentView (Timeline& tl, shared_ptr 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 bbox () const { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr content = _content.lock (); if (!film || !content) { @@ -99,7 +100,7 @@ public: return dcpomatic::Rect ( time_x (content->position ()) - 8, - y_pos (_track) - 8, + y_pos (_track.get()) - 8, content->length_after_trim () * _timeline.pixels_per_time_unit() + 16, _timeline.track_height() + 16 ); @@ -122,7 +123,7 @@ public: _track = t; } - int track () const { + optional track () const { return _track; } @@ -133,6 +134,8 @@ private: void do_paint (wxGraphicsContext* gc) { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr 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 * _timeline.pixels_per_time_unit(), _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 * _timeline.pixels_per_time_unit(), _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; - int _track; + optional _track; bool _selected; boost::signals2::scoped_connection _content_connection; @@ -410,25 +413,17 @@ Timeline::assign_tracks () { for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { shared_ptr cv = dynamic_pointer_cast (*i); - if (cv) { - cv->set_track (0); - _tracks = 1; - } - } - - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + if (!cv) { continue; } - shared_ptr acv_content = acv->content(); + shared_ptr content = cv->content(); - int t = 1; + int t = 0; while (1) { ViewList::iterator j = _views.begin(); while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + shared_ptr test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; @@ -436,10 +431,10 @@ Timeline::assign_tracks () shared_ptr 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' */ @@ -457,7 +452,7 @@ Timeline::assign_tracks () } } - acv->set_track (t); + cv->set_track (t); _tracks = max (_tracks, t + 1); } -- 2.30.2