X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=2a8555e7ce0b3fd8abcedd14dc369e2c7e43712d;hp=60200d8bb7edc81ce5977221029429e122047cfd;hb=b9f949d688b6e9563f6350286bbbc3f169b1b9fe;hpb=e0255a64d22440d718e5512f34a4f21f0d37a21b diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 60200d8bb..2a8555e7c 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -18,40 +18,42 @@ */ +#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_labels_view.h" -#include "timeline_video_content_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_atmos_content_view.h" -#include "content_panel.h" +#include "timeline_time_axis_view.h" +#include "timeline_video_content_view.h" #include "wx_util.h" -#include "film_viewer.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/timer.h" -#include "lib/audio_content.h" +#include "lib/playlist.h" #include "lib/text_content.h" +#include "lib/timer.h" #include "lib/video_content.h" -#include "lib/atmos_mxf_content.h" +#include +LIBDCP_DISABLE_WARNINGS #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 std::abs; +using std::min; 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; @@ -59,11 +61,13 @@ using namespace dcpomatic; 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, weak_ptr viewer) + +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)) @@ -77,7 +81,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film, w , _left_down (false) , _down_view_position (0) , _first_move (false) - , _menu (this) + , _menu (this, viewer) , _snap (true) , _tool (SELECT) , _x_scroll_rate (16) @@ -126,18 +130,21 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film, w _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 () { @@ -152,11 +159,12 @@ Timeline::paint_labels () _labels_canvas->GetViewStart (&vsx, &vsy); gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset()); - _labels_view->paint (gc, list >()); + _labels_view->paint (gc, {}); delete gc; } + void Timeline::paint_main () { @@ -182,7 +190,7 @@ Timeline::paint_main () 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 */ + /* 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; } @@ -199,7 +207,7 @@ 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), @@ -211,12 +219,9 @@ Timeline::paint_main () /* 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); + 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); @@ -224,6 +229,7 @@ Timeline::paint_main () delete gc; } + void Timeline::film_change (ChangeType type, Film::Property p) { @@ -239,6 +245,7 @@ Timeline::film_change (ChangeType type, Film::Property p) } } + void Timeline::recreate_views () { @@ -274,6 +281,7 @@ Timeline::recreate_views () Refresh (); } + void Timeline::film_content_change (ChangeType type, int property, bool frequent) { @@ -293,6 +301,7 @@ Timeline::film_content_change (ChangeType type, int property, bool frequent) } } + template int place (shared_ptr film, TimelineViewList& views, int& tracks) @@ -345,6 +354,7 @@ place (shared_ptr film, 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. */ @@ -366,12 +376,14 @@ struct AudioMappingComparator { } }; + void Timeline::assign_tracks () { /* Tracks are: - Video (mono or left-eye) - Video (right-eye) + Video 1 + Video 2 + Video N Text 1 Text 2 Text N @@ -393,29 +405,7 @@ Timeline::assign_tracks () } } - /* 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 video_tracks = place (film, _views, _tracks); int const text_tracks = place (film, _views, _tracks); /* Atmos */ @@ -441,7 +431,7 @@ Timeline::assign_tracks () sort(views.begin(), views.end(), AudioMappingComparator()); int const audio_tracks = place (film, views, _tracks); - _labels_view->set_3d (have_3d); + _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); @@ -450,12 +440,14 @@ Timeline::assign_tracks () _reels_view->set_y (8); } + int Timeline::tracks () const { return _tracks; } + void Timeline::setup_scrollbars () { @@ -472,6 +464,7 @@ Timeline::setup_scrollbars () _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate); } + shared_ptr Timeline::event_to_view (wxMouseEvent& ev) { @@ -483,7 +476,6 @@ Timeline::event_to_view (wxMouseEvent& ev) 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; } @@ -494,6 +486,7 @@ Timeline::event_to_view (wxMouseEvent& ev) return *i; } + void Timeline::left_down (wxMouseEvent& ev) { @@ -513,6 +506,7 @@ Timeline::left_down (wxMouseEvent& ev) } } + void Timeline::left_down_select (wxMouseEvent& ev) { @@ -526,6 +520,12 @@ Timeline::left_down_select (wxMouseEvent& ev) _down_view_position = content_view->content()->position (); } + 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) { @@ -569,6 +569,7 @@ Timeline::left_down_select (wxMouseEvent& ev) } } + void Timeline::left_up (wxMouseEvent& ev) { @@ -588,6 +589,7 @@ Timeline::left_up (wxMouseEvent& ev) } } + void Timeline::left_up_select (wxMouseEvent& ev) { @@ -612,6 +614,7 @@ Timeline::left_up_select (wxMouseEvent& ev) _end_snaps.clear (); } + void Timeline::left_up_zoom (wxMouseEvent& ev) { @@ -625,6 +628,8 @@ 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; } @@ -645,12 +650,14 @@ Timeline::left_up_zoom (wxMouseEvent& ev) Refresh (); } + void Timeline::set_pixels_per_track (int h) { _pixels_per_track = max(_minimum_pixels_per_track, h); } + void Timeline::mouse_moved (wxMouseEvent& ev) { @@ -668,6 +675,7 @@ Timeline::mouse_moved (wxMouseEvent& ev) } } + void Timeline::mouse_moved_select (wxMouseEvent& ev) { @@ -678,6 +686,7 @@ Timeline::mouse_moved_select (wxMouseEvent& ev) set_position_from_event (ev); } + void Timeline::mouse_moved_zoom (wxMouseEvent& ev) { @@ -689,6 +698,7 @@ Timeline::mouse_moved_zoom (wxMouseEvent& ev) Refresh (); } + void Timeline::right_down (wxMouseEvent& ev) { @@ -710,6 +720,7 @@ Timeline::right_down (wxMouseEvent& ev) } } + void Timeline::right_down_select (wxMouseEvent& ev) { @@ -727,6 +738,7 @@ 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 { @@ -736,6 +748,7 @@ Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) } } + void Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) { @@ -801,18 +814,21 @@ Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) film->set_sequence (false); } + void Timeline::force_redraw (dcpomatic::Rect const & r) { _main_canvas->RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } + shared_ptr Timeline::film () const { return _film.lock (); } + void Timeline::resized () { @@ -823,6 +839,7 @@ Timeline::resized () setup_scrollbars (); } + void Timeline::clear_selection () { @@ -834,6 +851,7 @@ Timeline::clear_selection () } } + TimelineContentViewList Timeline::selected_views () const { @@ -849,6 +867,7 @@ Timeline::selected_views () const return sel; } + ContentList Timeline::selected_content () const { @@ -861,6 +880,7 @@ Timeline::selected_content () const return sel; } + void Timeline::set_selection (ContentList selection) { @@ -872,18 +892,21 @@ Timeline::set_selection (ContentList selection) } } + 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) { @@ -895,6 +918,7 @@ Timeline::scrolled (wxScrollWinEvent& ev) ev.Skip (); } + void Timeline::tool_clicked (Tool t) { @@ -912,6 +936,7 @@ Timeline::tool_clicked (Tool t) } } + void Timeline::zoom_all () {