X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=f6ede297db3a809408c1a2f7dad9b68437760ed8;hb=HEAD;hp=6fac627276e9468a848fc3abeeb8389dad3a92d3;hpb=beddaeab9011e745dcac9732f4e8de3f91bd81a5;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 6fac62727..2789d2a54 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,51 +18,63 @@ */ +#include "content_panel.h" #include "film_editor.h" +#include "film_viewer.h" #include "timeline.h" -#include "timeline_time_axis_view.h" -#include "timeline_reels_view.h" +#include "timeline_atmos_content_view.h" +#include "timeline_audio_content_view.h" #include "timeline_labels_view.h" +#include "timeline_reels_view.h" +#include "timeline_text_content_view.h" +#include "timeline_time_axis_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/atmos_mxf_content.h" +#include "lib/audio_content.h" #include "lib/film.h" -#include "lib/playlist.h" #include "lib/image_content.h" +#include "lib/playlist.h" +#include "lib/text_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 +LIBDCP_DISABLE_WARNINGS #include -#include -#include +LIBDCP_ENABLE_WARNINGS +#include #include -#include + +using std::abs; +using std::dynamic_pointer_cast; using std::list; -using std::cout; -using std::min; +using std::make_shared; using std::max; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::min; +using std::shared_ptr; +using std::weak_ptr; 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_track_height = 16; +int const Timeline::_minimum_pixels_per_track = 16; -Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) + +Timeline::Timeline(wxWindow* parent, ContentPanel* cp, shared_ptr film, FilmViewer& 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)) @@ -70,19 +82,21 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) , _left_down (false) , _down_view_position (0) , _first_move (false) - , _menu (this) + , _menu (this, viewer) , _snap (true) , _tool (SELECT) , _x_scroll_rate (16) , _y_scroll_rate (16) - , _track_height (48) + , _pixels_per_track (48) + , _first_resize (true) + , _timer (this) { #ifndef __WXOSX__ _labels_canvas->SetDoubleBuffered (true); _main_canvas->SetDoubleBuffered (true); #endif - wxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); + 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); @@ -95,71 +109,149 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) _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_THUMBTRACK, boost::bind (&Timeline::scrolled, this, _1)); + _main_canvas->Bind (wxEVT_MOUSEWHEEL, boost::bind(&Timeline::mouse_wheel_turned, this, _1)); + _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_changed (Film::CONTENT); + film_change(ChangeType::DONE, FilmProperty::CONTENT); - SetMinSize (wxSize (640, 4 * track_height() + 96)); + SetMinSize (wxSize (640, 4 * pixels_per_track() + 96)); - _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)); + _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)); - _pixels_per_second = max (_minimum_pixels_per_second, static_cast(640) / film->length().seconds ()); + 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::mouse_wheel_turned(wxMouseEvent& event) +{ + auto const rotation = event.GetWheelRotation(); + + if (event.ControlDown()) { + /* On my mouse one click of the scroll wheel is 120, and it's -ve when + * scrolling the wheel towards me. + */ + auto const scale = rotation > 0 ? + (1.0 / (rotation / 90.0)) : + (-rotation / 90.0); + + int before_start_x; + int before_start_y; + _main_canvas->GetViewStart(&before_start_x, &before_start_y); + + auto const before_pps = _pixels_per_second.get_value_or(1); + auto const before_pos = _last_mouse_wheel_x && *_last_mouse_wheel_x == event.GetX() ? + *_last_mouse_wheel_time : + (before_start_x * _x_scroll_rate + event.GetX()) / before_pps; + + set_pixels_per_second(before_pps * scale); + setup_scrollbars(); + + auto after_left = std::max(0.0, before_pos * _pixels_per_second.get_value_or(1) - event.GetX()); + _main_canvas->Scroll(after_left / _x_scroll_rate, before_start_y); + _labels_canvas->Scroll(0, before_start_y); + Refresh(); + + if (!_last_mouse_wheel_x || *_last_mouse_wheel_x != event.GetX()) { + _last_mouse_wheel_x = event.GetX(); + _last_mouse_wheel_time = before_pos; + } + } else if (event.ShiftDown()) { + int before_start_x; + int before_start_y; + _main_canvas->GetViewStart(&before_start_x, &before_start_y); + auto const width = _main_canvas->GetSize().GetWidth(); + _main_canvas->Scroll(std::max(0.0, before_start_x - rotation * 100.0 / width), before_start_y); + } +} + + +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); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto film = _film.lock(); + if (film->content().empty()) { + return; + } + + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } + dcp::ScopeGuard sg = [gc]() { delete gc; }; + int vsx, vsy; _labels_canvas->GetViewStart (&vsx, &vsy); gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset()); - _labels_view->paint (gc, list >()); - - delete gc; + _labels_view->paint (gc, {}); } + void Timeline::paint_main () { wxPaintDC dc (_main_canvas); + dc.Clear(); + + auto film = _film.lock(); + if (film->content().empty()) { + return; + } + _main_canvas->DoPrepareDC (dc); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } - int vsx, vsy; - _main_canvas->GetViewStart (&vsx, &vsy); - gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate); + dcp::ScopeGuard sg = [gc]() { delete gc; }; gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); - BOOST_FOREACH (shared_ptr i, _views) { + for (auto i: _views) { - shared_ptr ic = dynamic_pointer_cast (i); + auto ic = dynamic_pointer_cast (i); /* Find areas of overlap with other content views, so that we can plot them */ - 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 */ + 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; } - optional > r = j->bbox().intersection (i->bbox()); + auto r = j->bbox().intersection(i->bbox()); if (r) { overlaps.push_back (r.get ()); } @@ -169,36 +261,47 @@ Timeline::paint_main () } 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->SetPen(gui_is_dark() ? *wxWHITE_PEN : *wxBLACK_PEN); gc->SetBrush (*wxTRANSPARENT_BRUSH); gc->DrawRectangle ( min (_down_point.x, _zoom_point->x), min (_down_point.y, _zoom_point->y), - fabs (_down_point.x - _zoom_point->x), - fabs (_down_point.y - _zoom_point->y) + abs (_down_point.x - _zoom_point->x), + abs (_down_point.y - _zoom_point->y) ); } - delete gc; + /* Playhead */ + + gc->SetPen (*wxRED_PEN); + auto path = gc->CreatePath (); + double const ph = _viewer.position().seconds() * pixels_per_second().get_value_or(0); + path.MoveToPoint (ph, 0); + path.AddLineToPoint (ph, pixels_per_track() * _tracks + 32); + gc->StrokePath (path); } + void -Timeline::film_changed (Film::Property p) +Timeline::film_change(ChangeType type, FilmProperty p) { - if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { + if (type != ChangeType::DONE) { + return; + } + + if (p == FilmProperty::CONTENT || p == FilmProperty::REEL_TYPE || p == FilmProperty::REEL_LENGTH) { ensure_ui_thread (); recreate_views (); - } else if (p == Film::CONTENT_ORDER) { + } else if (p == FilmProperty::CONTENT_ORDER) { Refresh (); } } + void Timeline::recreate_views () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -207,21 +310,21 @@ Timeline::recreate_views () _views.push_back (_time_axis_view); _views.push_back (_reels_view); - BOOST_FOREACH (shared_ptr i, film->content ()) { + for (auto i: film->content ()) { if (i->video) { - _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); + _views.push_back (make_shared(*this, i)); } - if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); + if (i->has_mapped_audio()) { + _views.push_back (make_shared(*this, i)); } - if (i->subtitle) { - _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); + for (auto j: i->text) { + _views.push_back (make_shared(*this, i, j)); } - if (dynamic_pointer_cast (i)) { - _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); + if (i->atmos) { + _views.push_back (make_shared(*this, i)); } } @@ -230,50 +333,60 @@ Timeline::recreate_views () Refresh (); } + void -Timeline::film_content_changed (int property, bool frequent) +Timeline::film_content_change (ChangeType type, int property, bool frequent) { + if (type != ChangeType::DONE) { + return; + } + ensure_ui_thread (); - if (property == AudioContentProperty::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 (); } } + template int -place (TimelineViewList& views, int& tracks) +place (shared_ptr film, TimelineViewList& views, int& tracks) { int const base = tracks; - BOOST_FOREACH (shared_ptr i, views) { + for (auto i: views) { if (!dynamic_pointer_cast(i)) { continue; } - shared_ptr cv = dynamic_pointer_cast (i); + auto cv = dynamic_pointer_cast (i); + DCPOMATIC_ASSERT(cv); int t = base; - shared_ptr content = cv->content(); - DCPTimePeriod const content_period (content->position(), content->end()); + auto content = cv->content(); + DCPTimePeriod const content_period = content->period(film); while (true) { - TimelineViewList::iterator j = views.begin(); + auto j = views.begin(); while (j != views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + auto test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; } - shared_ptr test_content = test->content(); + auto test_content = test->content(); if ( test->track() && test->track().get() == t && - content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end()))) { + content_period.overlap(test_content->period(film)) + ) { /* we have an overlap on track `t' */ ++t; break; @@ -295,65 +408,67 @@ place (TimelineViewList& views, int& tracks) 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) - Subtitle 1 - Subtitle 2 - Subtitle N + Video 1 + Video 2 + Video N + Text 1 + Text 2 + Text N Atmos Audio 1 Audio 2 Audio N */ + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); + _tracks = 0; - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr c = dynamic_pointer_cast (*i); + for (auto i: _views) { + auto c = dynamic_pointer_cast(i); if (c) { c->unset_track (); } } - /* Video */ - - bool have_3d = false; - BOOST_FOREACH (shared_ptr i, _views) { - shared_ptr 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() == VIDEO_FRAME_TYPE_3D_RIGHT) { - cv->set_track (1); - _tracks = max (_tracks, 2); - have_3d = true; - } else { - cv->set_track (0); - } - } - - _tracks = max (_tracks, 1); - - /* Subtitle */ - - int const subtitle_tracks = place (_views, _tracks); + int const video_tracks = place (film, _views, _tracks); + int const text_tracks = place (film, _views, _tracks); /* Atmos */ bool have_atmos = false; - BOOST_FOREACH (shared_ptr i, _views) { - shared_ptr cv = dynamic_pointer_cast (i); - if (!cv) { - continue; - } - if (dynamic_pointer_cast (i)) { - cv->set_track (_tracks - 1); + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); + if (cv) { + cv->set_track (_tracks); have_atmos = true; } } @@ -362,55 +477,70 @@ Timeline::assign_tracks () ++_tracks; } - /* Audio */ + /* Audio. We're sorting the views so that we get the audio views in order of increasing + DCP channel index. + */ - place (_views, _tracks); + 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_subtitle_tracks (subtitle_tracks); + _labels_view->set_video_tracks (video_tracks); + _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 Timeline::tracks () const { return _tracks; } + void Timeline::setup_scrollbars () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film || !_pixels_per_second) { return; } - _labels_canvas->SetVirtualSize (_labels_view->bbox().width, tracks() * track_height() + 96); + + 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(), tracks() * track_height() + 96); + _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) { /* 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()); + 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)) { - shared_ptr cv = dynamic_pointer_cast (*i); ++i; } if (i == _views.rend ()) { - return shared_ptr (); + return {}; } return *i; } + void Timeline::left_down (wxMouseEvent& ev) { @@ -422,16 +552,20 @@ Timeline::left_down (wxMouseEvent& ev) 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) { - shared_ptr view = event_to_view (ev); - shared_ptr content_view = dynamic_pointer_cast (view); + auto view = event_to_view (ev); + auto content_view = dynamic_pointer_cast(view); _down_view.reset (); @@ -440,14 +574,20 @@ Timeline::left_down_select (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); + if (dynamic_pointer_cast(view)) { + int vsx, vsy; + _main_canvas->GetViewStart(&vsx, &vsy); + _viewer.seek(DCPTime::from_seconds((ev.GetPosition().x + vsx * _x_scroll_rate) / _pixels_per_second.get_value_or(1)), true); + } + + 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); } } @@ -459,18 +599,21 @@ Timeline::left_down_select (wxMouseEvent& ev) 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); } } @@ -480,6 +623,7 @@ Timeline::left_down_select (wxMouseEvent& ev) } } + void Timeline::left_up (wxMouseEvent& ev) { @@ -492,9 +636,14 @@ Timeline::left_up (wxMouseEvent& ev) case ZOOM: left_up_zoom (ev); break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; } } + void Timeline::left_up_select (wxMouseEvent& ev) { @@ -503,7 +652,12 @@ Timeline::left_up_select (wxMouseEvent& ev) } _content_panel->set_selection (selected_content ()); - set_position_from_event (ev); + /* 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. + */ + set_position_from_event (ev, true); /* Clear up up the stuff we don't do during drag */ assign_tracks (); @@ -514,6 +668,7 @@ Timeline::left_up_select (wxMouseEvent& ev) _end_snaps.clear (); } + void Timeline::left_up_zoom (wxMouseEvent& ev) { @@ -527,25 +682,36 @@ Timeline::left_up_zoom (wxMouseEvent& ev) 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 */ + _zoom_point = optional (); + Refresh (); return; } - DCPTime const time_left = DCPTime::from_seconds((top_left.x + vsx) / *_pixels_per_second); - DCPTime const time_right = DCPTime::from_seconds((bottom_right.x + vsx) / *_pixels_per_second); - _pixels_per_second = max (_minimum_pixels_per_second, double(GetSize().GetWidth()) / (time_right.seconds() - time_left.seconds())); + 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) / _track_height; - double const tracks_bottom = double(bottom_right.y) / _track_height; - _track_height = max(_minimum_track_height, int(lrint(GetSize().GetHeight() / (tracks_bottom - tracks_top)))); + 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 (); - _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, tracks_top * _track_height / _y_scroll_rate); - _labels_canvas->Scroll (0, tracks_top * _track_height / _y_scroll_rate); + 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) { @@ -556,9 +722,14 @@ Timeline::mouse_moved (wxMouseEvent& ev) case ZOOM: mouse_moved_zoom (ev); break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; } } + void Timeline::mouse_moved_select (wxMouseEvent& ev) { @@ -569,6 +740,7 @@ Timeline::mouse_moved_select (wxMouseEvent& ev) set_position_from_event (ev); } + void Timeline::mouse_moved_zoom (wxMouseEvent& ev) { @@ -577,9 +749,11 @@ Timeline::mouse_moved_zoom (wxMouseEvent& ev) } _zoom_point = ev.GetPosition (); + setup_scrollbars(); Refresh (); } + void Timeline::right_down (wxMouseEvent& ev) { @@ -589,19 +763,24 @@ Timeline::right_down (wxMouseEvent& ev) break; case ZOOM: /* Zoom out */ - _pixels_per_second = max (_minimum_pixels_per_second, *_pixels_per_second / 2); - _track_height = max (_minimum_track_height, _track_height / 2); + 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) { - shared_ptr view = event_to_view (ev); - shared_ptr cv = dynamic_pointer_cast (view); + auto view = event_to_view (ev); + auto cv = dynamic_pointer_cast (view); if (!cv) { return; } @@ -614,17 +793,19 @@ Timeline::right_down_select (wxMouseEvent& ev) _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; + 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; @@ -632,7 +813,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 @@ -649,11 +830,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). */ @@ -661,11 +844,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); } @@ -681,49 +864,56 @@ 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 (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 Timeline::film () const { return _film.lock (); } + void Timeline::resized () { + 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); } } } + TimelineContentViewList 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); } @@ -732,47 +922,108 @@ Timeline::selected_views () const return sel; } + 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; } + 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) { - _labels_canvas->Scroll (0, ev.GetPosition ()); + 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) / std::max(1.0, film->length().seconds())); + set_pixels_per_track((_main_canvas->GetSize().GetHeight() - tracks_y_offset() - _time_axis_view->bbox().height - 32) / std::max(1, _tracks)); + setup_scrollbars (); + _main_canvas->Scroll (0, 0); + _labels_canvas->Scroll (0, 0); + Refresh (); +} + + +void +Timeline::keypress(wxKeyEvent const& event) +{ + if (event.GetKeyCode() == WXK_DELETE) { + auto film = _film.lock(); + DCPOMATIC_ASSERT(film); + film->remove_content(selected_content()); + } else { + switch (event.GetRawKeyCode()) { + case '+': + set_pixels_per_second(_pixels_per_second.get_value_or(1) * 2); + setup_scrollbars(); + break; + case '-': + set_pixels_per_second(_pixels_per_second.get_value_or(1) / 2); + setup_scrollbars(); + break; + } + } +} +