X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=cac9318cca2eac486aee8ce30cb40c87f08a872f;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=667bf5f873a69081aebab94255093b00fe89077f;hpb=c9152723208a20542b147e8a879117d6a5a76a45;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 667bf5f87..cac9318cc 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -25,40 +25,49 @@ #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 std::abs; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; +using namespace dcpomatic; -Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) +/* 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) : 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)) @@ -71,7 +80,8 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) , _tool (SELECT) , _x_scroll_rate (16) , _y_scroll_rate (16) - , _track_height (48) + , _pixels_per_track (48) + , _first_resize (true) { #ifndef __WXOSX__ _labels_canvas->SetDoubleBuffered (true); @@ -91,20 +101,41 @@ 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_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 (CHANGE_TYPE_DONE, Film::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 (0.01, static_cast(640) / film->length().seconds ()); + shared_ptr vp = viewer.lock (); + DCPOMATIC_ASSERT (vp); + _viewer_position_change_connection = vp->PositionChanged.connect (bind(&Timeline::position_change, this)); setup_scrollbars (); _labels_canvas->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_NEVER); } +void +Timeline::position_change () +{ + Refresh (); +} + +void +Timeline::set_pixels_per_second (double pps) +{ + _pixels_per_second = max (_minimum_pixels_per_second, pps); +} + void Timeline::paint_labels () { @@ -117,7 +148,7 @@ Timeline::paint_labels () int vsx, vsy; _labels_canvas->GetViewStart (&vsx, &vsy); - gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate); + gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset()); _labels_view->paint (gc, list >()); @@ -171,17 +202,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 */ + + shared_ptr vp = _viewer.lock (); + DCPOMATIC_ASSERT (vp); + + gc->SetPen (*wxRED_PEN); + wxGraphicsPath 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 (); @@ -211,8 +258,8 @@ Timeline::recreate_views () _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); } - if (i->subtitle) { - _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); + BOOST_FOREACH (shared_ptr j, i->text) { + _views.push_back (shared_ptr (new TimelineTextContentView (*this, i, j))); } if (dynamic_pointer_cast (i)) { @@ -226,12 +273,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 (); @@ -240,7 +293,7 @@ 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; @@ -254,7 +307,7 @@ place (TimelineViewList& views, int& tracks) int t = base; shared_ptr content = cv->content(); - DCPTimePeriod const content_period (content->position(), content->end()); + DCPTimePeriod const content_period (content->position(), content->end(film)); while (true) { TimelineViewList::iterator j = views.begin(); @@ -268,7 +321,7 @@ place (TimelineViewList& views, int& tracks) shared_ptr 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; @@ -290,21 +343,45 @@ 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; + shared_ptr cva = dynamic_pointer_cast(a); + if (cva) { + list 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); + if (cvb) { + list 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 + Text 1 + Text 2 + Text N Atmos Audio 1 Audio 2 Audio N */ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + _tracks = 0; for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -335,9 +412,9 @@ 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 */ @@ -357,15 +434,20 @@ 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); + TimelineViewList 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_audio_tracks (audio_tracks); + _labels_view->set_text_tracks (text_tracks); _labels_view->set_atmos (have_atmos); - _time_axis_view->set_y (tracks() * track_height() + 64); + _time_axis_view->set_y (tracks()); _reels_view->set_y (8); } @@ -382,9 +464,12 @@ Timeline::setup_scrollbars () 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); } @@ -417,6 +502,9 @@ Timeline::left_down (wxMouseEvent& ev) left_down_select (ev); break; case ZOOM: + case ZOOM_ALL: + case SNAP: + case SEQUENCE: /* Nothing to do */ break; } @@ -460,12 +548,15 @@ Timeline::left_down_select (wxMouseEvent& ev) continue; } + shared_ptr 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()) { + BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points(film)) { _start_snaps.push_back (i); } } @@ -487,6 +578,10 @@ Timeline::left_up (wxMouseEvent& ev) case ZOOM: left_up_zoom (ev); break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; } } @@ -498,7 +593,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 (); @@ -520,22 +620,34 @@ Timeline::left_up_zoom (wxMouseEvent& ev) 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; + } + 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 = GetSize().GetWidth() / (time_right.seconds() - time_left.seconds()); + 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 = 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) { @@ -546,6 +658,10 @@ Timeline::mouse_moved (wxMouseEvent& ev) case ZOOM: mouse_moved_zoom (ev); break; + case ZOOM_ALL: + case SNAP: + case SEQUENCE: + break; } } @@ -579,11 +695,15 @@ Timeline::right_down (wxMouseEvent& ev) break; case ZOOM: /* Zoom out */ - _pixels_per_second = *_pixels_per_second / 2; - _track_height = max (8, _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; } } @@ -614,7 +734,7 @@ Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) } void -Timeline::set_position_from_event (wxMouseEvent& ev) +Timeline::set_position_from_event (wxMouseEvent& ev, bool force_emit) { if (!_pixels_per_second) { return; @@ -641,9 +761,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev) DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps); - if (_snap) { + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); - DCPTime const new_end = new_position + _down_view->content()->length_after_trim(); + if (_snap) { + DCPTime 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). */ @@ -671,17 +793,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 @@ -693,6 +813,10 @@ Timeline::film () const void Timeline::resized () { + if (_main_canvas->GetSize().GetWidth() > 0 && _first_resize) { + zoom_all (); + _first_resize = false; + } setup_scrollbars (); } @@ -745,3 +869,56 @@ 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) +{ + 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 () +{ + shared_ptr 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 (); +}