X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=0231bc400de29838f06d28f9108c014a81d58158;hb=53c7f717da44c6ff681bde8946875e4f39764b25;hp=c60568e3a369c38daec288b27450902e1ff123ca;hpb=7bcf60f8ad3acd4dcae77a120216839b665c4335;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index c60568e3a..0231bc400 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -25,7 +25,7 @@ #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" @@ -34,13 +34,14 @@ #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; @@ -96,14 +97,20 @@ 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_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 * 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)); setup_scrollbars (); _labels_canvas->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_NEVER); @@ -190,8 +197,12 @@ Timeline::paint_main () } 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 (); @@ -221,8 +232,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)) { @@ -236,12 +247,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) { recreate_views (); + } else if (property == ContentProperty::POSITION || property == ContentProperty::LENGTH) { + _reels_view->force_redraw (); } else if (!frequent) { setup_scrollbars (); Refresh (); @@ -300,15 +317,36 @@ 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 @@ -345,9 +383,9 @@ Timeline::assign_tracks () _tracks = max (_tracks, 1); - /* Subtitle */ + /* Texts */ - int const subtitle_tracks = place (_views, _tracks); + int const text_tracks = place (_views, _tracks); /* Atmos */ @@ -367,12 +405,17 @@ 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 (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()); @@ -392,9 +435,12 @@ Timeline::setup_scrollbars () if (!film || !_pixels_per_second) { return; } - _labels_canvas->SetVirtualSize (_labels_view->bbox().width, tracks() * pixels_per_track() + 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() * pixels_per_track() + tracks_y_offset() + _time_axis_view->bbox().height); + _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), h); _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate); } @@ -428,6 +474,8 @@ Timeline::left_down (wxMouseEvent& ev) break; case ZOOM: case ZOOM_ALL: + case SNAP: + case SEQUENCE: /* Nothing to do */ break; } @@ -499,6 +547,8 @@ Timeline::left_up (wxMouseEvent& ev) left_up_zoom (ev); break; case ZOOM_ALL: + case SNAP: + case SEQUENCE: break; } } @@ -542,13 +592,14 @@ Timeline::left_up_zoom (wxMouseEvent& ev) DCPTime 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) / _pixels_per_track; - double const tracks_bottom = double(bottom_right.y) / _pixels_per_track; + 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 * _pixels_per_track / _y_scroll_rate); - _labels_canvas->Scroll (0, tracks_top * _pixels_per_track / _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 (); @@ -571,6 +622,8 @@ Timeline::mouse_moved (wxMouseEvent& ev) mouse_moved_zoom (ev); break; case ZOOM_ALL: + case SNAP: + case SEQUENCE: break; } } @@ -611,6 +664,8 @@ Timeline::right_down (wxMouseEvent& ev) Refresh (); break; case ZOOM_ALL: + case SNAP: + case SEQUENCE: break; } } @@ -709,7 +764,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) 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 @@ -794,7 +849,9 @@ 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 (); } @@ -810,6 +867,9 @@ Timeline::tool_clicked (Tool t) case ZOOM_ALL: zoom_all (); break; + case SNAP: + case SEQUENCE: + break; } }