X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=3294676fc2f8daaf8d5e0b9ce0704f326b1917c0;hp=2e90b3a81c4ea0f8326cb8f2b09bdf0f2ea8b370;hb=9b946fc5250eff5a5dd4a661896916fcd5d9bd4b;hpb=870a574324d28d4b2a4574e33de5c690a0ed55ad diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 2e90b3a81..3294676fc 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. @@ -25,44 +25,51 @@ #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) +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)) @@ -77,13 +84,14 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) , _y_scroll_rate (16) , _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); @@ -104,17 +112,26 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) _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 (CHANGE_TYPE_DONE, Film::CONTENT); 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)); + + 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) { @@ -126,7 +143,7 @@ Timeline::paint_labels () { wxPaintDC dc (_labels_canvas); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } @@ -146,7 +163,7 @@ Timeline::paint_main () wxPaintDC dc (_main_canvas); _main_canvas->DoPrepareDC (dc); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } @@ -157,20 +174,20 @@ Timeline::paint_main () 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); + list> overlaps; + for (auto j: _views) { + auto 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()); + auto r = j->bbox().intersection(i->bbox()); if (r) { overlaps.push_back (r.get ()); } @@ -187,17 +204,33 @@ Timeline::paint_main () 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) ); } + /* 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 (type != CHANGE_TYPE_DONE) { + return; + } + if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { ensure_ui_thread (); recreate_views (); @@ -209,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; } @@ -218,21 +251,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))); + _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)); } } @@ -242,12 +275,18 @@ Timeline::recreate_views () } void -Timeline::film_content_changed (int property, bool frequent) +Timeline::film_content_change (ChangeType type, int property, bool frequent) { + if (type != CHANGE_TYPE_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 (); @@ -256,35 +295,35 @@ Timeline::film_content_changed (int property, bool frequent) 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); 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->position(), content->end(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(DCPTimePeriod(test_content->position(), test_content->end(film)))) { /* we have an overlap on track `t' */ ++t; break; @@ -312,16 +351,16 @@ place (TimelineViewList& views, int& tracks) struct AudioMappingComparator { bool operator()(shared_ptr a, shared_ptr b) { int la = -1; - shared_ptr cva = dynamic_pointer_cast(a); + auto cva = dynamic_pointer_cast(a); if (cva) { - list oc = cva->content()->audio->mapping().mapped_output_channels(); - la = *min_element(begin(oc), end(oc)); + auto oc = cva->content()->audio->mapping().mapped_output_channels(); + la = *min_element(boost::begin(oc), boost::end(oc)); } int lb = -1; - shared_ptr cvb = dynamic_pointer_cast(b); + auto cvb = dynamic_pointer_cast(b); if (cvb) { - list oc = cvb->content()->audio->mapping().mapped_output_channels(); - lb = *min_element(begin(oc), end(oc)); + auto oc = cvb->content()->audio->mapping().mapped_output_channels(); + lb = *min_element(boost::begin(oc), boost::end(oc)); } return la < lb; } @@ -333,19 +372,22 @@ Timeline::assign_tracks () /* Tracks are: Video (mono or left-eye) Video (right-eye) - Subtitle 1 - Subtitle 2 - Subtitle 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 (); } @@ -354,8 +396,8 @@ Timeline::assign_tracks () /* Video */ bool have_3d = false; - BOOST_FOREACH (shared_ptr i, _views) { - shared_ptr cv = dynamic_pointer_cast (i); + for (auto i: _views) { + auto cv = dynamic_pointer_cast(i); if (!cv) { continue; } @@ -372,20 +414,17 @@ Timeline::assign_tracks () _tracks = max (_tracks, 1); - /* Subtitle */ + /* Texts */ - int const subtitle_tracks = place (_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; } } @@ -398,13 +437,13 @@ Timeline::assign_tracks () DCP channel index. */ - TimelineViewList views = _views; + auto views = _views; sort(views.begin(), views.end(), AudioMappingComparator()); - int const audio_tracks = place (views, _tracks); + int const audio_tracks = place (film, views, _tracks); _labels_view->set_3d (have_3d); _labels_view->set_audio_tracks (audio_tracks); - _labels_view->set_subtitle_tracks (subtitle_tracks); + _labels_view->set_text_tracks (text_tracks); _labels_view->set_atmos (have_atmos); _time_axis_view->set_y (tracks()); @@ -420,7 +459,7 @@ Timeline::tracks () const void Timeline::setup_scrollbars () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film || !_pixels_per_second) { return; } @@ -437,15 +476,19 @@ 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); + auto cv = dynamic_pointer_cast(*i); ++i; } if (i == _views.rend ()) { - return shared_ptr (); + return {}; } return *i; @@ -473,8 +516,8 @@ Timeline::left_down (wxMouseEvent& ev) 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 (); @@ -483,14 +526,14 @@ 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); + 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); } } @@ -502,18 +545,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); } } @@ -550,7 +596,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 (); @@ -577,8 +628,8 @@ Timeline::left_up_zoom (wxMouseEvent& ev) 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); + 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; @@ -662,8 +713,8 @@ Timeline::right_down (wxMouseEvent& ev) 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; } @@ -679,14 +730,14 @@ Timeline::right_down_select (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; @@ -694,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 @@ -711,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). */ @@ -723,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); } @@ -743,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 (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 @@ -775,8 +826,8 @@ Timeline::resized () 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); } @@ -788,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); } @@ -802,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; @@ -814,8 +864,8 @@ 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 ()); } @@ -865,7 +915,7 @@ Timeline::tool_clicked (Tool t) void Timeline::zoom_all () { - shared_ptr film = _film.lock (); + 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);