X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=5a98c829ad8815d3c0cd512c6db09ffd89ebfe72;hp=1516202bcbb286719ff00e96b4b12fffeeb04386;hb=c82ea3df77d7b5d341d8ec0e6773eb8029ccb4bc;hpb=352477d76fee274767e4221e6c50c1d1e7938fee diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 1516202bc..5a98c829a 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 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 . */ @@ -21,93 +22,219 @@ #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_text_content_view.h" +#include "timeline_atmos_content_view.h" #include "content_panel.h" #include "wx_util.h" +#include "film_viewer.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/text_content.h" +#include "lib/video_content.h" +#include "lib/atmos_mxf_content.h" #include -#include -#include #include +#include #include using std::list; using std::cout; +using std::min; using std::max; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::abs; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; +using std::make_shared; using boost::bind; using boost::optional; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + +/* 3 hours in 640 pixels */ +double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3); +int const Timeline::_minimum_pixels_per_track = 16; -Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) - : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) +Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film, weak_ptr viewer) + : wxPanel (parent, wxID_ANY) + , _labels_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)) + , _main_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)) , _content_panel (cp) , _film (film) + , _viewer (viewer) , _time_axis_view (new TimelineTimeAxisView (*this, 64)) , _reels_view (new TimelineReelsView (*this, 32)) + , _labels_view (new TimelineLabelsView (*this)) , _tracks (0) , _left_down (false) , _down_view_position (0) , _first_move (false) , _menu (this) , _snap (true) + , _tool (SELECT) + , _x_scroll_rate (16) + , _y_scroll_rate (16) + , _pixels_per_track (48) + , _first_resize (true) + , _timer (this) { #ifndef __WXOSX__ - SetDoubleBuffered (true); + _labels_canvas->SetDoubleBuffered (true); + _main_canvas->SetDoubleBuffered (true); #endif - 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)); + auto sizer = new wxBoxSizer (wxHORIZONTAL); + sizer->Add (_labels_canvas, 0, wxEXPAND); + _labels_canvas->SetMinSize (wxSize (_labels_view->bbox().width, -1)); + sizer->Add (_main_canvas, 1, wxEXPAND); + SetSizer (sizer); + + _labels_canvas->Bind (wxEVT_PAINT, boost::bind (&Timeline::paint_labels, this)); + _main_canvas->Bind (wxEVT_PAINT, boost::bind (&Timeline::paint_main, this)); + _main_canvas->Bind (wxEVT_LEFT_DOWN, boost::bind (&Timeline::left_down, this, _1)); + _main_canvas->Bind (wxEVT_LEFT_UP, boost::bind (&Timeline::left_up, this, _1)); + _main_canvas->Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down, this, _1)); + _main_canvas->Bind (wxEVT_MOTION, boost::bind (&Timeline::mouse_moved, this, _1)); + _main_canvas->Bind (wxEVT_SIZE, boost::bind (&Timeline::resized, this)); + _main_canvas->Bind (wxEVT_SCROLLWIN_TOP, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_BOTTOM, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_LINEUP, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_LINEDOWN, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_PAGEUP, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_PAGEDOWN, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_SCROLLWIN_THUMBTRACK, boost::bind (&Timeline::scrolled, this, _1)); + + film_change (ChangeType::DONE, Film::Property::CONTENT); + + SetMinSize (wxSize (640, 4 * pixels_per_track() + 96)); + + _film_changed_connection = film->Change.connect (bind (&Timeline::film_change, this, _1, _2)); + _film_content_change_connection = film->ContentChange.connect (bind (&Timeline::film_content_change, this, _1, _3, _4)); + + Bind (wxEVT_TIMER, boost::bind(&Timeline::update_playhead, this)); + _timer.Start (200, wxTIMER_CONTINUOUS); + + setup_scrollbars (); + _labels_canvas->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_NEVER); +} + +void +Timeline::update_playhead () +{ + Refresh (); +} + +void +Timeline::set_pixels_per_second (double pps) +{ + _pixels_per_second = max (_minimum_pixels_per_second, pps); +} + +void +Timeline::paint_labels () +{ + wxPaintDC dc (_labels_canvas); + + auto gc = wxGraphicsContext::Create (dc); + if (!gc) { + return; + } - film_changed (Film::CONTENT); + int vsx, vsy; + _labels_canvas->GetViewStart (&vsx, &vsy); + gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset()); - SetMinSize (wxSize (640, tracks() * track_height() + 96)); + _labels_view->paint (gc, list >()); - _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)); + delete gc; } void -Timeline::paint () +Timeline::paint_main () { - wxPaintDC dc (this); + wxPaintDC dc (_main_canvas); + _main_canvas->DoPrepareDC (dc); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - (*i)->paint (gc); + int vsx, vsy; + _main_canvas->GetViewStart (&vsx, &vsy); + gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate); + + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + + for (auto i: _views) { + + auto ic = dynamic_pointer_cast (i); + + /* Find areas of overlap with other content views, so that we can plot them */ + list> overlaps; + for (auto j: _views) { + auto jc = dynamic_pointer_cast (j); + /* No overlap with non-content views, views on 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; + } + + auto r = j->bbox().intersection(i->bbox()); + if (r) { + overlaps.push_back (r.get ()); + } + } + + i->paint (gc, overlaps); + } + + if (_zoom_point) { + /* Translate back as _down_point and _zoom_point do not take scroll into account */ + gc->Translate (vsx * _x_scroll_rate, vsy * _y_scroll_rate); + gc->SetPen (*wxBLACK_PEN); + gc->SetBrush (*wxTRANSPARENT_BRUSH); + gc->DrawRectangle ( + min (_down_point.x, _zoom_point->x), + min (_down_point.y, _zoom_point->y), + abs (_down_point.x - _zoom_point->x), + abs (_down_point.y - _zoom_point->y) + ); } + /* Playhead */ + + auto vp = _viewer.lock (); + DCPOMATIC_ASSERT (vp); + + gc->SetPen (*wxRED_PEN); + auto path = gc->CreatePath (); + double const ph = vp->position().seconds() * pixels_per_second().get_value_or(0); + path.MoveToPoint (ph, 0); + path.AddLineToPoint (ph, pixels_per_track() * _tracks + 32); + gc->StrokePath (path); + delete gc; } void -Timeline::film_changed (Film::Property p) +Timeline::film_change (ChangeType type, Film::Property p) { - if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { + if (type != ChangeType::DONE) { + return; + } + + if (p == Film::Property::CONTENT || p == Film::Property::REEL_TYPE || p == Film::Property::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 (); - } + } else if (p == Film::Property::CONTENT_ORDER) { Refresh (); } } @@ -115,7 +242,7 @@ Timeline::film_changed (Film::Property p) void Timeline::recreate_views () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -124,91 +251,203 @@ Timeline::recreate_views () _views.push_back (_time_axis_view); _views.push_back (_reels_view); - BOOST_FOREACH (shared_ptr i, film->content ()) { - if (dynamic_pointer_cast (i)) { - _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); + for (auto i: film->content ()) { + if (i->video) { + _views.push_back (make_shared(*this, i)); + } + + if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { + _views.push_back (make_shared(*this, i)); } - shared_ptr ac = dynamic_pointer_cast (i); - if (ac && !ac->audio_mapping().mapped_output_channels().empty ()) { - _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); + for (auto j: i->text) { + _views.push_back (make_shared(*this, i, j)); } - shared_ptr sc = dynamic_pointer_cast (i); - if (sc && sc->has_subtitles ()) { - _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, sc))); + if (i->atmos) { + _views.push_back (make_shared(*this, i)); } } assign_tracks (); - setup_pixels_per_second (); + setup_scrollbars (); Refresh (); } void -Timeline::film_content_changed (int property) +Timeline::film_content_change (ChangeType type, int property, bool frequent) { + if (type != ChangeType::DONE) { + return; + } + ensure_ui_thread (); - if (property == AudioContentProperty::AUDIO_STREAMS) { + if (property == AudioContentProperty::STREAMS || property == VideoContentProperty::FRAME_TYPE) { recreate_views (); + } else if (property == ContentProperty::POSITION || property == ContentProperty::LENGTH) { + _reels_view->force_redraw (); + } else if (!frequent) { + setup_scrollbars (); + Refresh (); } } -void -Timeline::assign_tracks () +template +int +place (shared_ptr film, TimelineViewList& views, int& tracks) { - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr c = dynamic_pointer_cast (*i); - if (c) { - c->unset_track (); - } - } + int const base = tracks; - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (!cv) { + for (auto i: views) { + if (!dynamic_pointer_cast(i)) { continue; } - shared_ptr content = cv->content(); - DCPTimePeriod content_period (content->position(), content->end()); + auto cv = dynamic_pointer_cast (i); + + int t = base; + + auto content = cv->content(); + DCPTimePeriod const content_period (content->position(), content->end(film)); - int t = 0; while (true) { - TimelineViewList::iterator j = _views.begin(); - while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + auto j = views.begin(); + while (j != views.end()) { + auto test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; } - shared_ptr test_content = test->content(); - - 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; - } + auto test_content = test->content(); + if ( + test->track() && test->track().get() == t && + content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end(film)))) { + /* we have an overlap on track `t' */ + ++t; + break; } ++j; } - if (j == _views.end ()) { + if (j == views.end ()) { /* no overlap on `t' */ break; } } cv->set_track (t); - _tracks = max (_tracks, t + 1); + tracks = max (tracks, t + 1); + } + + return tracks - base; +} + +/** Compare the mapped output channels of two TimelineViews, so we can into + * order of first mapped DCP channel. + */ +struct AudioMappingComparator { + bool operator()(shared_ptr a, shared_ptr b) { + int la = -1; + auto cva = dynamic_pointer_cast(a); + if (cva) { + auto oc = cva->content()->audio->mapping().mapped_output_channels(); + la = *min_element(boost::begin(oc), boost::end(oc)); + } + int lb = -1; + auto cvb = dynamic_pointer_cast(b); + if (cvb) { + auto oc = cvb->content()->audio->mapping().mapped_output_channels(); + lb = *min_element(boost::begin(oc), boost::end(oc)); + } + return la < lb; + } +}; + +void +Timeline::assign_tracks () +{ + /* Tracks are: + Video (mono or left-eye) + Video (right-eye) + Text 1 + Text 2 + Text N + Atmos + Audio 1 + Audio 2 + Audio N + */ + + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); + + _tracks = 0; + + for (auto i: _views) { + auto c = dynamic_pointer_cast(i); + if (c) { + c->unset_track (); + } + } + + /* Video */ + + bool have_3d = false; + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); + if (!cv) { + continue; + } + + /* Video on tracks 0 and maybe 1 (left and right eye) */ + if (cv->content()->video->frame_type() == VideoFrameType::THREE_D_RIGHT) { + cv->set_track (1); + _tracks = max (_tracks, 2); + have_3d = true; + } else { + cv->set_track (0); + } + } + + _tracks = max (_tracks, 1); + + /* Texts */ + + int const text_tracks = place (film, _views, _tracks); + + /* Atmos */ + + bool have_atmos = false; + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); + if (cv) { + cv->set_track (_tracks); + have_atmos = true; + } + } + + if (have_atmos) { + ++_tracks; } - _time_axis_view->set_y (tracks() * track_height() + 64); - _reels_view->set_y (tracks() * track_height() + 32); + /* Audio. We're sorting the views so that we get the audio views in order of increasing + DCP channel index. + */ + + auto views = _views; + sort(views.begin(), views.end(), AudioMappingComparator()); + int const audio_tracks = place (film, views, _tracks); + + _labels_view->set_3d (have_3d); + _labels_view->set_audio_tracks (audio_tracks); + _labels_view->set_text_tracks (text_tracks); + _labels_view->set_atmos (have_atmos); + + _time_axis_view->set_y (tracks()); + _reels_view->set_y (8); } int @@ -218,27 +457,38 @@ Timeline::tracks () const } void -Timeline::setup_pixels_per_second () +Timeline::setup_scrollbars () { - shared_ptr film = _film.lock (); - if (!film || film->length() == DCPTime ()) { + auto film = _film.lock (); + if (!film || !_pixels_per_second) { return; } - _pixels_per_second = static_cast(width() - x_offset() * 2) / film->length().seconds (); + int const h = tracks() * pixels_per_track() + tracks_y_offset() + _time_axis_view->bbox().height; + + _labels_canvas->SetVirtualSize (_labels_view->bbox().width, h); + _labels_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate); + _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), h); + _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate); } shared_ptr Timeline::event_to_view (wxMouseEvent& ev) { - TimelineViewList::iterator i = _views.begin(); - Position const p (ev.GetX(), ev.GetY()); - while (i != _views.end() && !(*i)->bbox().contains (p)) { + /* Search backwards through views so that we find the uppermost one first */ + auto i = _views.rbegin(); + + int vsx, vsy; + _main_canvas->GetViewStart (&vsx, &vsy); + Position const p (ev.GetX() + vsx * _x_scroll_rate, ev.GetY() + vsy * _y_scroll_rate); + + while (i != _views.rend() && !(*i)->bbox().contains (p)) { + auto cv = dynamic_pointer_cast(*i); ++i; } - if (i == _views.end ()) { - return shared_ptr (); + if (i == _views.rend ()) { + return {}; } return *i; @@ -247,8 +497,27 @@ Timeline::event_to_view (wxMouseEvent& ev) void Timeline::left_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr content_view = dynamic_pointer_cast (view); + _left_down = true; + _down_point = ev.GetPosition (); + + switch (_tool) { + case SELECT: + left_down_select (ev); + break; + case ZOOM: + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + /* Nothing to do */ + break; + } +} + +void +Timeline::left_down_select (wxMouseEvent& ev) +{ + auto view = event_to_view (ev); + auto content_view = dynamic_pointer_cast(view); _down_view.reset (); @@ -257,14 +526,14 @@ Timeline::left_down (wxMouseEvent& ev) _down_view_position = content_view->content()->position (); } - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); if (!cv) { continue; } if (!ev.ShiftDown ()) { - cv->set_selected (view == *i); + cv->set_selected (view == i); } } @@ -272,24 +541,25 @@ Timeline::left_down (wxMouseEvent& ev) content_view->set_selected (!content_view->selected ()); } - _left_down = true; - _down_point = ev.GetPosition (); _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); + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); if (!cv || cv == _down_view || cv->content() == _down_view->content()) { continue; } + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); + _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()); + _start_snaps.push_back (cv->content()->end(film)); + _end_snaps.push_back (cv->content()->end(film)); - BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) { + for (auto i: cv->content()->reel_split_points(film)) { _start_snaps.push_back (i); } } @@ -304,25 +574,102 @@ Timeline::left_up (wxMouseEvent& ev) { _left_down = false; + switch (_tool) { + case SELECT: + left_up_select (ev); + break; + case ZOOM: + left_up_zoom (ev); + break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; + } +} + +void +Timeline::left_up_select (wxMouseEvent& ev) +{ if (_down_view) { _down_view->content()->set_change_signals_frequent (false); - _content_panel->set_selection (_down_view->content ()); } - set_position_from_event (ev); - - /* We don't do this during drag, and set_position_from_event above - might not have changed the position, so do it now. + _content_panel->set_selection (selected_content ()); + /* Since we may have just set change signals back to `not-frequent', we have to + make sure this position change is signalled, even if the position value has + not changed since the last time it was set (with frequent=true). This is + a bit of a hack. */ - setup_pixels_per_second (); + set_position_from_event (ev, true); + + /* Clear up up the stuff we don't do during drag */ + assign_tracks (); + setup_scrollbars (); Refresh (); _start_snaps.clear (); _end_snaps.clear (); } +void +Timeline::left_up_zoom (wxMouseEvent& ev) +{ + _zoom_point = ev.GetPosition (); + + int vsx, vsy; + _main_canvas->GetViewStart (&vsx, &vsy); + + wxPoint top_left(min(_down_point.x, _zoom_point->x), min(_down_point.y, _zoom_point->y)); + wxPoint bottom_right(max(_down_point.x, _zoom_point->x), max(_down_point.y, _zoom_point->y)); + + if ((bottom_right.x - top_left.x) < 8 || (bottom_right.y - top_left.y) < 8) { + /* Very small zoom rectangle: we assume it wasn't intentional */ + return; + } + + auto const time_left = DCPTime::from_seconds((top_left.x + vsx) / *_pixels_per_second); + auto const time_right = DCPTime::from_seconds((bottom_right.x + vsx) / *_pixels_per_second); + set_pixels_per_second (double(GetSize().GetWidth()) / (time_right.seconds() - time_left.seconds())); + + double const tracks_top = double(top_left.y - tracks_y_offset()) / _pixels_per_track; + double const tracks_bottom = double(bottom_right.y - tracks_y_offset()) / _pixels_per_track; + set_pixels_per_track (lrint(GetSize().GetHeight() / (tracks_bottom - tracks_top))); + + setup_scrollbars (); + int const y = (tracks_top * _pixels_per_track + tracks_y_offset()) / _y_scroll_rate; + _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, y); + _labels_canvas->Scroll (0, y); + + _zoom_point = optional (); + Refresh (); +} + +void +Timeline::set_pixels_per_track (int h) +{ + _pixels_per_track = max(_minimum_pixels_per_track, h); +} + void Timeline::mouse_moved (wxMouseEvent& ev) +{ + switch (_tool) { + case SELECT: + mouse_moved_select (ev); + break; + case ZOOM: + mouse_moved_zoom (ev); + break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; + } +} + +void +Timeline::mouse_moved_select (wxMouseEvent& ev) { if (!_left_down) { return; @@ -331,11 +678,43 @@ Timeline::mouse_moved (wxMouseEvent& ev) set_position_from_event (ev); } +void +Timeline::mouse_moved_zoom (wxMouseEvent& ev) +{ + if (!_left_down) { + return; + } + + _zoom_point = ev.GetPosition (); + Refresh (); +} + void Timeline::right_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr cv = dynamic_pointer_cast (view); + switch (_tool) { + case SELECT: + right_down_select (ev); + break; + case ZOOM: + /* Zoom out */ + set_pixels_per_second (*_pixels_per_second / 2); + set_pixels_per_track (_pixels_per_track / 2); + setup_scrollbars (); + Refresh (); + break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; + } +} + +void +Timeline::right_down_select (wxMouseEvent& ev) +{ + auto view = event_to_view (ev); + auto cv = dynamic_pointer_cast (view); if (!cv) { return; } @@ -351,14 +730,14 @@ Timeline::right_down (wxMouseEvent& ev) void Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) const { - DCPTime const d = a - b; + auto const d = a - b; if (!nearest_distance || d.abs() < nearest_distance.get().abs()) { nearest_distance = d; } } void -Timeline::set_position_from_event (wxMouseEvent& ev) +Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) { if (!_pixels_per_second) { return; @@ -366,7 +745,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) double const pps = _pixels_per_second.get (); - wxPoint const p = ev.GetPosition(); + auto const p = ev.GetPosition(); if (!_first_move) { /* We haven't moved yet; in that case, we must move the mouse some reasonable distance @@ -383,11 +762,13 @@ Timeline::set_position_from_event (wxMouseEvent& ev) return; } - DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps); + auto new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps); - if (_snap) { + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); - DCPTime const new_end = new_position + _down_view->content()->length_after_trim(); + if (_snap) { + auto const new_end = new_position + _down_view->content()->length_after_trim(film); /* Signed `distance' to nearest thing (i.e. negative is left on the timeline, positive is right). */ @@ -395,11 +776,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev) /* Find the nearest snap point */ - BOOST_FOREACH (DCPTime i, _start_snaps) { + for (auto i: _start_snaps) { maybe_snap (i, new_position, nearest_distance); } - BOOST_FOREACH (DCPTime i, _end_snaps) { + for (auto i: _end_snaps) { maybe_snap (i, new_end, nearest_distance); } @@ -415,17 +796,15 @@ Timeline::set_position_from_event (wxMouseEvent& ev) new_position = DCPTime (); } - _down_view->content()->set_position (new_position); + _down_view->content()->set_position (film, new_position, force_emit); - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - film->set_sequence_video (false); + film->set_sequence (false); } void Timeline::force_redraw (dcpomatic::Rect const & r) { - RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); + _main_canvas->RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } shared_ptr @@ -437,14 +816,18 @@ Timeline::film () const void Timeline::resized () { - setup_pixels_per_second (); + if (_main_canvas->GetSize().GetWidth() > 0 && _first_resize) { + zoom_all (); + _first_resize = false; + } + setup_scrollbars (); } void Timeline::clear_selection () { - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (auto i: _views) { + shared_ptr cv = dynamic_pointer_cast(i); if (cv) { cv->set_selected (false); } @@ -456,8 +839,8 @@ Timeline::selected_views () const { TimelineContentViewList sel; - for (TimelineViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); if (cv && cv->selected()) { sel.push_back (cv); } @@ -470,10 +853,9 @@ ContentList Timeline::selected_content () const { ContentList sel; - TimelineContentViewList views = selected_views (); - for (TimelineContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { - sel.push_back ((*i)->content ()); + for (auto i: selected_views()) { + sel.push_back(i->content()); } return sel; @@ -482,10 +864,63 @@ Timeline::selected_content () const void Timeline::set_selection (ContentList selection) { - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (auto i: _views) { + auto cv = dynamic_pointer_cast (i); if (cv) { cv->set_selected (find (selection.begin(), selection.end(), cv->content ()) != selection.end ()); } } } + +int +Timeline::tracks_y_offset () const +{ + return _reels_view->bbox().height + 4; +} + +int +Timeline::width () const +{ + return _main_canvas->GetVirtualSize().GetWidth(); +} + +void +Timeline::scrolled (wxScrollWinEvent& ev) +{ + if (ev.GetOrientation() == wxVERTICAL) { + int x, y; + _main_canvas->GetViewStart (&x, &y); + _labels_canvas->Scroll (0, y); + } + ev.Skip (); +} + +void +Timeline::tool_clicked (Tool t) +{ + switch (t) { + case ZOOM: + case SELECT: + _tool = t; + break; + case ZOOM_ALL: + zoom_all (); + break; + case SNAP: + case SEQUENCE: + break; + } +} + +void +Timeline::zoom_all () +{ + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); + set_pixels_per_second ((_main_canvas->GetSize().GetWidth() - 32) / film->length().seconds()); + set_pixels_per_track ((_main_canvas->GetSize().GetHeight() - tracks_y_offset() - _time_axis_view->bbox().height - 32) / _tracks); + setup_scrollbars (); + _main_canvas->Scroll (0, 0); + _labels_canvas->Scroll (0, 0); + Refresh (); +}