X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=d5643b556db5747c7e80099165217886435f0b87;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=2119e781322f2cedae4e3083ffd20b7ead4ffda2;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 2119e7813..6bb216df8 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,30 +1,47 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - 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 . */ -#include -#include -#include -#include "lib/film.h" -#include "lib/playlist.h" #include "film_editor.h" #include "timeline.h" +#include "timeline_time_axis_view.h" +#include "timeline_reels_view.h" +#include "timeline_labels_view.h" +#include "timeline_video_content_view.h" +#include "timeline_audio_content_view.h" +#include "timeline_subtitle_content_view.h" +#include "timeline_atmos_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/timer.h" +#include "lib/audio_content.h" +#include "lib/subtitle_content.h" +#include "lib/video_content.h" +#include "lib/atmos_mxf_content.h" +#include +#include +#include +#include +#include using std::list; using std::cout; @@ -35,304 +52,14 @@ using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; -/** Parent class for components of the timeline (e.g. a piece of content or an axis) */ -class View : public boost::noncopyable -{ -public: - View (DCPTimeline& t) - : _timeline (t) - { - - } - - virtual ~View () {} - - void paint (wxGraphicsContext* g) - { - _last_paint_bbox = bbox (); - do_paint (g); - } - - void force_redraw () - { - _timeline.force_redraw (_last_paint_bbox); - _timeline.force_redraw (bbox ()); - } - - virtual dcpomatic::Rect bbox () const = 0; - -protected: - virtual void do_paint (wxGraphicsContext *) = 0; - - int time_x (DCPTime t) const - { - return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); - } - - DCPTimeline& _timeline; - -private: - dcpomatic::Rect _last_paint_bbox; -}; - - -/** Parent class for views of pieces of content */ -class ContentView : public View -{ -public: - ContentView (DCPTimeline& tl, shared_ptr c) - : View (tl) - , _content (c) - , _track (0) - , _selected (false) - { - _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3)); - } - - dcpomatic::Rect bbox () const - { - shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { - return dcpomatic::Rect (); - } - - return dcpomatic::Rect ( - time_x (content->position ()) - 8, - y_pos (_track) - 8, - content->length_after_trim () * _timeline.pixels_per_time_unit() + 16, - _timeline.track_height() + 16 - ); - } - - void set_selected (bool s) { - _selected = s; - force_redraw (); - } - - bool selected () const { - return _selected; - } - - shared_ptr content () const { - return _content.lock (); - } - - void set_track (int t) { - _track = t; - } - - int track () const { - return _track; - } - - virtual wxString type () const = 0; - virtual wxColour colour () const = 0; - -private: - - void do_paint (wxGraphicsContext* gc) - { - shared_ptr film = _timeline.film (); - shared_ptr cont = content (); - if (!film || !cont) { - return; - } - - DCPTime const position = cont->position (); - DCPTime const len = cont->length_after_trim (); - - wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2); - - gc->SetPen (*wxBLACK_PEN); - - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxPENSTYLE_SOLID)); - if (_selected) { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID)); - } else { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID)); - } - - 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); - gc->StrokePath (path); - gc->FillPath (path); - - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path_summary()).data(), type().data()); - wxDouble name_width; - wxDouble name_height; - wxDouble name_descent; - 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->ResetClip (); - } - - int y_pos (int t) const - { - return _timeline.tracks_position().y + t * _timeline.track_height(); - } - - void content_changed (int p, bool frequent) - { - ensure_ui_thread (); - - if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) { - force_redraw (); - } - - if (!frequent) { - _timeline.setup_pixels_per_time_unit (); - _timeline.Refresh (); - } - } - - boost::weak_ptr _content; - int _track; - bool _selected; - - boost::signals2::scoped_connection _content_connection; -}; - -class AudioContentView : public ContentView -{ -public: - AudioContentView (DCPTimeline& tl, shared_ptr c) - : ContentView (tl, c) - {} - -private: - wxString type () const - { - return _("audio"); - } - - wxColour colour () const - { - return wxColour (149, 121, 232, 255); - } -}; - -class VideoContentView : public ContentView -{ -public: - VideoContentView (DCPTimeline& tl, shared_ptr c) - : ContentView (tl, c) - {} - -private: - - wxString type () const - { - if (dynamic_pointer_cast (content ())) { - return _("video"); - } else { - return _("still"); - } - } - - wxColour colour () const - { - return wxColour (242, 92, 120, 255); - } -}; - -class DCPTimeAxisView : public View -{ -public: - DCPTimeAxisView (DCPTimeline& tl, int y) - : View (tl) - , _y (y) - {} - - dcpomatic::Rect bbox () const - { - return dcpomatic::Rect (0, _y - 4, _timeline.width(), 24); - } - - void set_y (int y) - { - _y = y; - force_redraw (); - } - -private: - - void do_paint (wxGraphicsContext* gc) - { - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - - int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); - if (mark_interval > 5) { - mark_interval -= mark_interval % 5; - } - if (mark_interval > 10) { - mark_interval -= mark_interval % 10; - } - if (mark_interval > 60) { - mark_interval -= mark_interval % 60; - } - if (mark_interval > 3600) { - mark_interval -= mark_interval % 3600; - } - - if (mark_interval < 1) { - mark_interval = 1; - } - - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (_timeline.x_offset(), _y); - path.AddLineToPoint (_timeline.width(), _y); - gc->StrokePath (path); - - DCPTime t = 0; - while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) { - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (t), _y - 4); - path.AddLineToPoint (time_x (t), _y + 4); - gc->StrokePath (path); - - int tc = t / TIME_HZ; - int const h = tc / 3600; - tc -= h * 3600; - int const m = tc / 60; - tc -= m * 60; - int const s = tc; - - wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); - wxDouble str_width; - wxDouble str_height; - wxDouble str_descent; - wxDouble str_leading; - gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - - int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit(); - if ((tx + str_width) < _timeline.width()) { - gc->DrawText (str, time_x (t), _y + 16); - } - - t += mark_interval * TIME_HZ; - } - } - -private: - int _y; -}; - - -DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) +Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) - , _film_editor (ed) + , _content_panel (cp) , _film (film) - , _time_axis_view (new DCPTimeAxisView (*this, 32)) + , _time_axis_view (new TimelineTimeAxisView (*this, 64)) + , _reels_view (new TimelineReelsView (*this, 32)) + , _labels_view (new TimelineLabelsView (*this)) , _tracks (0) - , _pixels_per_time_unit (0) , _left_down (false) , _down_view_position (0) , _first_move (false) @@ -341,24 +68,27 @@ DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr fil { #ifndef __WXOSX__ SetDoubleBuffered (true); -#endif +#endif - Bind (wxEVT_PAINT, boost::bind (&DCPTimeline::paint, this)); - Bind (wxEVT_LEFT_DOWN, boost::bind (&DCPTimeline::left_down, this, _1)); - Bind (wxEVT_LEFT_UP, boost::bind (&DCPTimeline::left_up, this, _1)); - Bind (wxEVT_RIGHT_DOWN, boost::bind (&DCPTimeline::right_down, this, _1)); - Bind (wxEVT_MOTION, boost::bind (&DCPTimeline::mouse_moved, this, _1)); - Bind (wxEVT_SIZE, boost::bind (&DCPTimeline::resized, this)); + Bind (wxEVT_PAINT, boost::bind (&Timeline::paint, this)); + Bind (wxEVT_LEFT_DOWN, boost::bind (&Timeline::left_down, this, _1)); + Bind (wxEVT_LEFT_UP, boost::bind (&Timeline::left_up, this, _1)); + Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down, this, _1)); + Bind (wxEVT_MOTION, boost::bind (&Timeline::mouse_moved, this, _1)); + Bind (wxEVT_SIZE, boost::bind (&Timeline::resized, this)); - playlist_changed (); + film_changed (Film::CONTENT); SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _playlist_connection = film->playlist()->Changed.connect (bind (&DCPTimeline::playlist_changed, this)); + _tracks_position = Position (_labels_view->bbox().width, 32); + + _film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1)); + _film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3)); } void -DCPTimeline::paint () +Timeline::paint () { wxPaintDC dc (this); @@ -367,87 +97,178 @@ DCPTimeline::paint () return; } - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + + BOOST_FOREACH (shared_ptr i, _views) { + + shared_ptr ic = dynamic_pointer_cast (i); + + /* Find areas of overlap */ + list > overlaps; + BOOST_FOREACH (shared_ptr j, _views) { + shared_ptr jc = dynamic_pointer_cast (j); + /* No overlap with non-content views, views no different tracks, audio views or non-active views */ + if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) { + continue; + } + + optional > r = j->bbox().intersection (i->bbox()); + if (r) { + overlaps.push_back (r.get ()); + } + } - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - (*i)->paint (gc); + i->paint (gc, overlaps); } delete gc; } void -DCPTimeline::playlist_changed () +Timeline::film_changed (Film::Property p) { - ensure_ui_thread (); - - shared_ptr fl = _film.lock (); - if (!fl) { + if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { + ensure_ui_thread (); + recreate_views (); + } else if (p == Film::CONTENT_ORDER) { + Refresh (); + } +} + +void +Timeline::recreate_views () +{ + shared_ptr film = _film.lock (); + if (!film) { return; } _views.clear (); _views.push_back (_time_axis_view); + _views.push_back (_reels_view); + _views.push_back (_labels_view); + + BOOST_FOREACH (shared_ptr i, film->content ()) { + if (i->video) { + _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); + } - ContentList content = fl->playlist()->content (); + if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { + _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); + } - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { - if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new VideoContentView (*this, *i))); + if (i->subtitle) { + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); } - if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i))); + + if (dynamic_pointer_cast (i)) { + _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); } } assign_tracks (); - setup_pixels_per_time_unit (); + setup_pixels_per_second (); Refresh (); } void -DCPTimeline::assign_tracks () +Timeline::film_content_changed (int property, bool frequent) { - 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; + ensure_ui_thread (); + + if (property == AudioContentProperty::STREAMS) { + recreate_views (); + } else if (!frequent) { + setup_pixels_per_second (); + Refresh (); + } +} + +void +Timeline::assign_tracks () +{ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr c = dynamic_pointer_cast (*i); + if (c) { + c->unset_track (); } } - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + /* See if we have any subtitle / atmos / right-eye views */ + bool have_3d = false; + bool have_subtitle = false; + bool have_atmos = false; + BOOST_FOREACH (shared_ptr i, _views) { + shared_ptr cv = dynamic_pointer_cast (i); + if (!cv) { continue; } - - shared_ptr acv_content = acv->content(); - int t = 1; - while (1) { - ViewList::iterator j = _views.begin(); + if (dynamic_pointer_cast (i)) { + if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + have_3d = true; + } + } else if (dynamic_pointer_cast (i)) { + have_subtitle = true; + } else if (dynamic_pointer_cast (i)) { + have_atmos = true; + } + } + + _labels_view->set_3d (have_3d); + _labels_view->set_subtitle (have_subtitle); + _labels_view->set_atmos (have_atmos); + + /* Hence decide where to start subtitle, atmos and audio tracks */ + int const subtitle = have_3d ? 2 : 1; + int const atmos = have_subtitle ? subtitle + 1 : subtitle; + int const audio = have_atmos ? atmos + 1: atmos; + + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv) { + continue; + } + + if (dynamic_pointer_cast (*i)) { + /* Video on tracks 0 and maybe 1 (left and right eye) */ + cv->set_track (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0); + _tracks = max (_tracks, have_3d ? 2 : 1); + continue; + } else if (dynamic_pointer_cast (*i)) { + cv->set_track (subtitle); + _tracks = max (_tracks, subtitle + 1); + continue; + } else if (dynamic_pointer_cast (*i)) { + cv->set_track (atmos); + _tracks = max (_tracks, atmos + 1); + continue; + } + + int t = audio; + + shared_ptr content = cv->content(); + DCPTimePeriod content_period (content->position(), content->end()); + + while (true) { + TimelineViewList::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; } - + shared_ptr test_content = test->content(); - - if (test && test->track() == 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()); - - if (!no_overlap) { + + if (test && test->track() && test->track().get() == t) { + if (content_period.overlaps (DCPTimePeriod(test_content->position(), test_content->end()))) { /* we have an overlap on track `t' */ ++t; break; } } - + ++j; } @@ -457,51 +278,54 @@ DCPTimeline::assign_tracks () } } - acv->set_track (t); + cv->set_track (t); _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 (8); } int -DCPTimeline::tracks () const +Timeline::tracks () const { return _tracks; } void -DCPTimeline::setup_pixels_per_time_unit () +Timeline::setup_pixels_per_second () { shared_ptr film = _film.lock (); - if (!film) { + if (!film || film->length() == DCPTime ()) { return; } - _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length (); + _pixels_per_second = static_cast(width() - tracks_position().x * 2) / film->length().seconds (); } -shared_ptr -DCPTimeline::event_to_view (wxMouseEvent& ev) +shared_ptr +Timeline::event_to_view (wxMouseEvent& ev) { - ViewList::iterator i = _views.begin(); + /* Search backwards through views so that we find the uppermost one first */ + TimelineViewList::reverse_iterator i = _views.rbegin(); Position const p (ev.GetX(), ev.GetY()); - while (i != _views.end() && !(*i)->bbox().contains (p)) { + while (i != _views.rend() && !(*i)->bbox().contains (p)) { + shared_ptr cv = dynamic_pointer_cast (*i); ++i; } - if (i == _views.end ()) { - return shared_ptr (); + if (i == _views.rend ()) { + return shared_ptr (); } return *i; } void -DCPTimeline::left_down (wxMouseEvent& ev) +Timeline::left_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr content_view = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr content_view = dynamic_pointer_cast (view); _down_view.reset (); @@ -510,19 +334,15 @@ DCPTimeline::left_down (wxMouseEvent& ev) _down_view_position = content_view->content()->position (); } - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (!cv) { continue; } - + if (!ev.ShiftDown ()) { cv->set_selected (view == *i); } - - if (view == *i) { - _film_editor->set_selection (cv->content ()); - } } if (content_view && ev.ShiftDown ()) { @@ -534,24 +354,51 @@ DCPTimeline::left_down (wxMouseEvent& ev) _first_move = false; if (_down_view) { + /* Pre-compute the points that we might snap to */ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv || cv == _down_view || cv->content() == _down_view->content()) { + continue; + } + + _start_snaps.push_back (cv->content()->position()); + _end_snaps.push_back (cv->content()->position()); + _start_snaps.push_back (cv->content()->end()); + _end_snaps.push_back (cv->content()->end()); + + BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) { + _start_snaps.push_back (i); + } + } + + /* Tell everyone that things might change frequently during the drag */ _down_view->content()->set_change_signals_frequent (true); } } void -DCPTimeline::left_up (wxMouseEvent& ev) +Timeline::left_up (wxMouseEvent& ev) { _left_down = false; if (_down_view) { _down_view->content()->set_change_signals_frequent (false); + _content_panel->set_selection (_down_view->content ()); } set_position_from_event (ev); + + /* Clear up up the stuff we don't do during drag */ + assign_tracks (); + setup_pixels_per_second (); + Refresh (); + + _start_snaps.clear (); + _end_snaps.clear (); } void -DCPTimeline::mouse_moved (wxMouseEvent& ev) +Timeline::mouse_moved (wxMouseEvent& ev) { if (!_left_down) { return; @@ -561,10 +408,10 @@ DCPTimeline::mouse_moved (wxMouseEvent& ev) } void -DCPTimeline::right_down (wxMouseEvent& ev) +Timeline::right_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr cv = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr cv = dynamic_pointer_cast (view); if (!cv) { return; } @@ -574,12 +421,27 @@ DCPTimeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - _menu.popup (_film, selected_content (), ev.GetPosition ()); + _menu.popup (_film, selected_content (), selected_views (), ev.GetPosition ()); +} + +void +Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) const +{ + DCPTime const d = a - b; + if (!nearest_distance || d.abs() < nearest_distance.get().abs()) { + nearest_distance = d; + } } void -DCPTimeline::set_position_from_event (wxMouseEvent& ev) +Timeline::set_position_from_event (wxMouseEvent& ev) { + if (!_pixels_per_second) { + return; + } + + double const pps = _pixels_per_second.get (); + wxPoint const p = ev.GetPosition(); if (!_first_move) { @@ -596,98 +458,82 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) if (!_down_view) { return; } - - DCPTime new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit; - + + DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps); + if (_snap) { - - bool first = true; - DCPTime nearest_distance = TIME_MAX; - DCPTime nearest_new_position = TIME_MAX; - - /* Find the nearest content edge; this is inefficient */ - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (!cv || cv == _down_view) { - continue; - } - - { - /* Snap starts to ends */ - DCPTime const d = abs (cv->content()->end() - new_position); - if (first || d < nearest_distance) { - nearest_distance = d; - nearest_new_position = cv->content()->end(); - } - } - - { - /* Snap ends to starts */ - DCPTime const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim())); - if (d < nearest_distance) { - nearest_distance = d; - nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim (); - } - } - - first = false; + + 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). + */ + optional nearest_distance; + + /* Find the nearest snap point */ + + BOOST_FOREACH (DCPTime i, _start_snaps) { + maybe_snap (i, new_position, nearest_distance); + } + + BOOST_FOREACH (DCPTime i, _end_snaps) { + maybe_snap (i, new_end, nearest_distance); } - - if (!first) { + + if (nearest_distance) { /* Snap if it's close; `close' means within a proportion of the time on the timeline */ - if (nearest_distance < (width() / pixels_per_time_unit()) / 32) { - new_position = nearest_new_position; + if (nearest_distance.get().abs() < DCPTime::from_seconds ((width() / pps) / 64)) { + new_position += nearest_distance.get (); } } } - - if (new_position < 0) { - new_position = 0; + + if (new_position < DCPTime ()) { + new_position = DCPTime (); } - + _down_view->content()->set_position (new_position); - + shared_ptr film = _film.lock (); - assert (film); - film->set_sequence_video (false); + DCPOMATIC_ASSERT (film); + film->set_sequence (false); } void -DCPTimeline::force_redraw (dcpomatic::Rect const & r) +Timeline::force_redraw (dcpomatic::Rect const & r) { RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } shared_ptr -DCPTimeline::film () const +Timeline::film () const { return _film.lock (); } void -DCPTimeline::resized () +Timeline::resized () { - setup_pixels_per_time_unit (); + setup_pixels_per_second (); } void -DCPTimeline::clear_selection () +Timeline::clear_selection () { - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (cv) { cv->set_selected (false); } } } -DCPTimeline::ContentViewList -DCPTimeline::selected_views () const +TimelineContentViewList +Timeline::selected_views () const { - ContentViewList sel; - - for (ViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + TimelineContentViewList sel; + + for (TimelineViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (cv && cv->selected()) { sel.push_back (cv); } @@ -697,14 +543,25 @@ DCPTimeline::selected_views () const } ContentList -DCPTimeline::selected_content () const +Timeline::selected_content () const { ContentList sel; - ContentViewList views = selected_views (); - - for (ContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { + TimelineContentViewList views = selected_views (); + + for (TimelineContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { sel.push_back ((*i)->content ()); } return sel; } + +void +Timeline::set_selection (ContentList selection) +{ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv) { + cv->set_selected (find (selection.begin(), selection.end(), cv->content ()) != selection.end ()); + } + } +}