X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=5a98c829ad8815d3c0cd512c6db09ffd89ebfe72;hp=cbea2333c8293d6dade6acfba38f6c6b749eb7d2;hb=c82ea3df77d7b5d341d8ec0e6773eb8029ccb4bc;hpb=690e8a09a4fe5fc703fe00260d5c9509efe2921b diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index cbea2333c..5a98c829a 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. @@ -39,8 +39,6 @@ #include "lib/video_content.h" #include "lib/atmos_mxf_content.h" #include -#include -#include #include #include #include @@ -50,12 +48,16 @@ using std::cout; using std::min; using std::max; using std::abs; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +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); @@ -89,7 +91,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film, w _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); @@ -110,7 +112,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film, w _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 (CHANGE_TYPE_DONE, Film::CONTENT); + film_change (ChangeType::DONE, Film::Property::CONTENT); SetMinSize (wxSize (640, 4 * pixels_per_track() + 96)); @@ -141,7 +143,7 @@ Timeline::paint_labels () { wxPaintDC dc (_labels_canvas); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } @@ -161,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; } @@ -172,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); - /* 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 ()); } @@ -209,11 +211,11 @@ Timeline::paint_main () /* Playhead */ - shared_ptr vp = _viewer.lock (); + auto vp = _viewer.lock (); DCPOMATIC_ASSERT (vp); gc->SetPen (*wxRED_PEN); - wxGraphicsPath path = gc->CreatePath (); + 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); @@ -225,14 +227,14 @@ Timeline::paint_main () void Timeline::film_change (ChangeType type, Film::Property p) { - if (type != CHANGE_TYPE_DONE) { + if (type != ChangeType::DONE) { return; } - if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { + 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) { + } else if (p == Film::Property::CONTENT_ORDER) { Refresh (); } } @@ -240,7 +242,7 @@ Timeline::film_change (ChangeType type, Film::Property p) void Timeline::recreate_views () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -249,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)); } - BOOST_FOREACH (shared_ptr j, i->text) { - _views.push_back (shared_ptr (new TimelineTextContentView (*this, i, j))); + 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)); } } @@ -275,7 +277,7 @@ Timeline::recreate_views () void Timeline::film_content_change (ChangeType type, int property, bool frequent) { - if (type != CHANGE_TYPE_DONE) { + if (type != ChangeType::DONE) { return; } @@ -297,28 +299,28 @@ 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(); + 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(film)))) { @@ -349,15 +351,15 @@ place (shared_ptr film, 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(); + 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(); + auto oc = cvb->content()->audio->mapping().mapped_output_channels(); lb = *min_element(boost::begin(oc), boost::end(oc)); } return la < lb; @@ -379,13 +381,13 @@ Timeline::assign_tracks () Audio N */ - shared_ptr film = _film.lock (); + 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 (); } @@ -394,14 +396,14 @@ 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; } /* Video on tracks 0 and maybe 1 (left and right eye) */ - if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + if (cv->content()->video->frame_type() == VideoFrameType::THREE_D_RIGHT) { cv->set_track (1); _tracks = max (_tracks, 2); have_3d = true; @@ -419,8 +421,8 @@ Timeline::assign_tracks () /* Atmos */ bool have_atmos = 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) { cv->set_track (_tracks); have_atmos = true; @@ -435,7 +437,7 @@ Timeline::assign_tracks () DCP channel index. */ - TimelineViewList views = _views; + auto views = _views; sort(views.begin(), views.end(), AudioMappingComparator()); int const audio_tracks = place (film, views, _tracks); @@ -457,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; } @@ -474,19 +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(); + 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; @@ -514,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 (); @@ -524,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); } } @@ -543,13 +545,13 @@ 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; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); _start_snaps.push_back (cv->content()->position()); @@ -557,7 +559,7 @@ Timeline::left_down_select (wxMouseEvent& ev) _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(film)) { + for (auto i: cv->content()->reel_split_points(film)) { _start_snaps.push_back (i); } } @@ -626,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; @@ -711,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; } @@ -728,7 +730,7 @@ 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; } @@ -743,7 +745,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) 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 @@ -760,13 +762,13 @@ Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) 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); - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); if (_snap) { - DCPTime const new_end = new_position + _down_view->content()->length_after_trim(film); + 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). */ @@ -774,11 +776,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) /* 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); } @@ -824,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); } @@ -837,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); } @@ -851,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; @@ -863,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 ()); } @@ -914,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);