X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=c1713bb61262e2bcc27047a60eadb2b9186baf47;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=ac26c77a9125d7ab31c2a34620831d980b5d6bc4;hpb=58588c485eac7c488a574fe923576f109ec0134e;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index ac26c77a9..c1713bb61 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,8 +22,14 @@ #include #include "lib/film.h" #include "lib/playlist.h" +#include "lib/image_content.h" #include "film_editor.h" #include "timeline.h" +#include "timeline_time_axis_view.h" +#include "timeline_video_content_view.h" +#include "timeline_audio_content_view.h" +#include "timeline_subtitle_content_view.h" +#include "content_panel.h" #include "wx_util.h" using std::list; @@ -35,304 +41,12 @@ using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; -/** Parent class for components of the timeline (e.g. a piece of content or an axis) */ -class View : public boost::noncopyable -{ -public: - View (DCPTimeline& t) - : _timeline (t) - { - - } - - virtual ~View () {} - - void paint (wxGraphicsContext* g) - { - _last_paint_bbox = bbox (); - do_paint (g); - } - - void force_redraw () - { - _timeline.force_redraw (_last_paint_bbox); - _timeline.force_redraw (bbox ()); - } - - virtual dcpomatic::Rect bbox () const = 0; - -protected: - virtual void do_paint (wxGraphicsContext *) = 0; - - int time_x (DCPTime t) const - { - return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); - } - - DCPTimeline& _timeline; - -private: - dcpomatic::Rect _last_paint_bbox; -}; - - -/** Parent class for views of pieces of content */ -class ContentView : public View -{ -public: - ContentView (DCPTimeline& tl, shared_ptr c) - : View (tl) - , _content (c) - , _track (0) - , _selected (false) - { - _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3)); - } - - dcpomatic::Rect bbox () const - { - shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { - return dcpomatic::Rect (); - } - - return dcpomatic::Rect ( - time_x (content->position ()) - 8, - y_pos (_track) - 8, - content->length_after_trim () * _timeline.pixels_per_time_unit() + 16, - _timeline.track_height() + 16 - ); - } - - void set_selected (bool s) { - _selected = s; - force_redraw (); - } - - bool selected () const { - return _selected; - } - - shared_ptr content () const { - return _content.lock (); - } - - void set_track (int t) { - _track = t; - } - - int track () const { - return _track; - } - - virtual wxString type () const = 0; - virtual wxColour colour () const = 0; - -private: - - void do_paint (wxGraphicsContext* gc) - { - shared_ptr film = _timeline.film (); - shared_ptr cont = content (); - if (!film || !cont) { - return; - } - - DCPTime const position = cont->position (); - DCPTime const len = cont->length_after_trim (); - - wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2); - - gc->SetPen (*wxBLACK_PEN); - - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxPENSTYLE_SOLID)); - if (_selected) { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID)); - } else { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID)); - } - - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (position), y_pos (_track) + 4); - path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4); - path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (position), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (position), y_pos (_track) + 4); - gc->StrokePath (path); - gc->FillPath (path); - - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path_summary()).data(), type().data()); - wxDouble name_width; - wxDouble name_height; - wxDouble name_descent; - wxDouble name_leading; - gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading); - - gc->Clip (wxRegion (time_x (position), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height())); - gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4); - gc->ResetClip (); - } - - int y_pos (int t) const - { - return _timeline.tracks_position().y + t * _timeline.track_height(); - } - - void content_changed (int p, bool frequent) - { - ensure_ui_thread (); - - if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) { - force_redraw (); - } - - if (!frequent) { - _timeline.setup_pixels_per_time_unit (); - _timeline.Refresh (); - } - } - - boost::weak_ptr _content; - int _track; - bool _selected; - - boost::signals2::scoped_connection _content_connection; -}; - -class AudioContentView : public ContentView -{ -public: - AudioContentView (DCPTimeline& tl, shared_ptr c) - : ContentView (tl, c) - {} - -private: - wxString type () const - { - return _("audio"); - } - - wxColour colour () const - { - return wxColour (149, 121, 232, 255); - } -}; - -class VideoContentView : public ContentView -{ -public: - VideoContentView (DCPTimeline& tl, shared_ptr c) - : ContentView (tl, c) - {} - -private: - - wxString type () const - { - if (dynamic_pointer_cast (content ())) { - return _("video"); - } else { - return _("still"); - } - } - - wxColour colour () const - { - return wxColour (242, 92, 120, 255); - } -}; - -class DCPTimeAxisView : public View -{ -public: - DCPTimeAxisView (DCPTimeline& tl, int y) - : View (tl) - , _y (y) - {} - - dcpomatic::Rect bbox () const - { - return dcpomatic::Rect (0, _y - 4, _timeline.width(), 24); - } - - void set_y (int y) - { - _y = y; - force_redraw (); - } - -private: - - void do_paint (wxGraphicsContext* gc) - { - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - - int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); - if (mark_interval > 5) { - mark_interval -= mark_interval % 5; - } - if (mark_interval > 10) { - mark_interval -= mark_interval % 10; - } - if (mark_interval > 60) { - mark_interval -= mark_interval % 60; - } - if (mark_interval > 3600) { - mark_interval -= mark_interval % 3600; - } - - if (mark_interval < 1) { - mark_interval = 1; - } - - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (_timeline.x_offset(), _y); - path.AddLineToPoint (_timeline.width(), _y); - gc->StrokePath (path); - - DCPTime t = 0; - while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) { - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (t), _y - 4); - path.AddLineToPoint (time_x (t), _y + 4); - gc->StrokePath (path); - - int tc = t / TIME_HZ; - int const h = tc / 3600; - tc -= h * 3600; - int const m = tc / 60; - tc -= m * 60; - int const s = tc; - - wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); - wxDouble str_width; - wxDouble str_height; - wxDouble str_descent; - wxDouble str_leading; - gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - - int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit(); - if ((tx + str_width) < _timeline.width()) { - gc->DrawText (str, time_x (t), _y + 16); - } - - t += mark_interval * TIME_HZ; - } - } - -private: - int _y; -}; - - -DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) +Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) - , _film_editor (ed) + , _content_panel (cp) , _film (film) - , _time_axis_view (new DCPTimeAxisView (*this, 32)) + , _time_axis_view (new TimelineTimeAxisView (*this, 32)) , _tracks (0) - , _pixels_per_time_unit (0) , _left_down (false) , _down_view_position (0) , _first_move (false) @@ -343,22 +57,23 @@ DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr fil SetDoubleBuffered (true); #endif - Bind (wxEVT_PAINT, boost::bind (&DCPTimeline::paint, this)); - Bind (wxEVT_LEFT_DOWN, boost::bind (&DCPTimeline::left_down, this, _1)); - Bind (wxEVT_LEFT_UP, boost::bind (&DCPTimeline::left_up, this, _1)); - Bind (wxEVT_RIGHT_DOWN, boost::bind (&DCPTimeline::right_down, this, _1)); - Bind (wxEVT_MOTION, boost::bind (&DCPTimeline::mouse_moved, this, _1)); - Bind (wxEVT_SIZE, boost::bind (&DCPTimeline::resized, this)); + Bind (wxEVT_PAINT, boost::bind (&Timeline::paint, this)); + Bind (wxEVT_LEFT_DOWN, boost::bind (&Timeline::left_down, this, _1)); + Bind (wxEVT_LEFT_UP, boost::bind (&Timeline::left_up, this, _1)); + Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down, this, _1)); + Bind (wxEVT_MOTION, boost::bind (&Timeline::mouse_moved, this, _1)); + Bind (wxEVT_SIZE, boost::bind (&Timeline::resized, this)); playlist_changed (); SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _playlist_connection = film->playlist()->Changed.connect (bind (&DCPTimeline::playlist_changed, this)); + _playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2)); } void -DCPTimeline::paint () +Timeline::paint () { wxPaintDC dc (this); @@ -367,9 +82,7 @@ DCPTimeline::paint () return; } - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); - - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { (*i)->paint (gc); } @@ -377,10 +90,15 @@ DCPTimeline::paint () } void -DCPTimeline::playlist_changed () +Timeline::playlist_changed () { ensure_ui_thread (); - + recreate_views (); +} + +void +Timeline::recreate_views () +{ shared_ptr fl = _film.lock (); if (!fl) { return; @@ -393,42 +111,65 @@ DCPTimeline::playlist_changed () for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new VideoContentView (*this, *i))); + _views.push_back (shared_ptr (new TimelineVideoContentView (*this, *i))); } - if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i))); + + shared_ptr ac = dynamic_pointer_cast (*i); + if (ac && !ac->audio_mapping().mapped_dcp_channels().empty ()) { + _views.push_back (shared_ptr (new TimelineAudioContentView (*this, *i))); + } + + shared_ptr sc = dynamic_pointer_cast (*i); + if (sc && sc->has_subtitles ()) { + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, sc))); } } assign_tracks (); - setup_pixels_per_time_unit (); + setup_pixels_per_second (); Refresh (); } void -DCPTimeline::assign_tracks () +Timeline::playlist_content_changed (int property) { - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (cv) { - cv->set_track (0); - _tracks = 1; + ensure_ui_thread (); + + if (property == ContentProperty::POSITION) { + assign_tracks (); + if (!_left_down) { + /* Only do this if we are not dragging, as it's confusing otherwise */ + setup_pixels_per_second (); + } + Refresh (); + } else if (property == AudioContentProperty::AUDIO_STREAMS) { + recreate_views (); + } +} + +void +Timeline::assign_tracks () +{ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr c = dynamic_pointer_cast (*i); + if (c) { + c->unset_track (); } } - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv) { continue; } - - shared_ptr acv_content = acv->content(); - int t = 1; - while (1) { - ViewList::iterator j = _views.begin(); + shared_ptr content = cv->content(); + + int t = 0; + while (true) { + TimelineViewList::iterator j = _views.begin(); while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + shared_ptr test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; @@ -436,10 +177,10 @@ DCPTimeline::assign_tracks () shared_ptr test_content = test->content(); - if (test && test->track() == t) { + if (test && test->track() && test->track().get() == t) { bool const no_overlap = - (acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) || - (acv_content->position() > test_content->end() && acv_content->end() > test_content->end()); + (content->position() < test_content->position() && content->end() < test_content->position()) || + (content->position() > test_content->end() && content->end() > test_content->end()); if (!no_overlap) { /* we have an overlap on track `t' */ @@ -457,7 +198,7 @@ DCPTimeline::assign_tracks () } } - acv->set_track (t); + cv->set_track (t); _tracks = max (_tracks, t + 1); } @@ -465,43 +206,43 @@ DCPTimeline::assign_tracks () } int -DCPTimeline::tracks () const +Timeline::tracks () const { return _tracks; } void -DCPTimeline::setup_pixels_per_time_unit () +Timeline::setup_pixels_per_second () { shared_ptr film = _film.lock (); - if (!film || film->length() == 0) { + if (!film || film->length() == DCPTime ()) { return; } - _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length (); + _pixels_per_second = static_cast(width() - x_offset() * 2) / film->length().seconds (); } -shared_ptr -DCPTimeline::event_to_view (wxMouseEvent& ev) +shared_ptr +Timeline::event_to_view (wxMouseEvent& ev) { - ViewList::iterator i = _views.begin(); + TimelineViewList::iterator i = _views.begin(); Position const p (ev.GetX(), ev.GetY()); while (i != _views.end() && !(*i)->bbox().contains (p)) { ++i; } if (i == _views.end ()) { - return shared_ptr (); + return shared_ptr (); } return *i; } void -DCPTimeline::left_down (wxMouseEvent& ev) +Timeline::left_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr content_view = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr content_view = dynamic_pointer_cast (view); _down_view.reset (); @@ -510,8 +251,8 @@ DCPTimeline::left_down (wxMouseEvent& ev) _down_view_position = content_view->content()->position (); } - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (!cv) { continue; } @@ -521,7 +262,7 @@ DCPTimeline::left_down (wxMouseEvent& ev) } if (view == *i) { - _film_editor->set_selection (cv->content ()); + _content_panel->set_selection (cv->content ()); } } @@ -539,7 +280,7 @@ DCPTimeline::left_down (wxMouseEvent& ev) } void -DCPTimeline::left_up (wxMouseEvent& ev) +Timeline::left_up (wxMouseEvent& ev) { _left_down = false; @@ -548,10 +289,16 @@ DCPTimeline::left_up (wxMouseEvent& ev) } set_position_from_event (ev); + + /* We don't do this during drag, and set_position_from_event above + might not have changed the position, so do it now. + */ + setup_pixels_per_second (); + Refresh (); } void -DCPTimeline::mouse_moved (wxMouseEvent& ev) +Timeline::mouse_moved (wxMouseEvent& ev) { if (!_left_down) { return; @@ -561,10 +308,10 @@ DCPTimeline::mouse_moved (wxMouseEvent& ev) } void -DCPTimeline::right_down (wxMouseEvent& ev) +Timeline::right_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr cv = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr cv = dynamic_pointer_cast (view); if (!cv) { return; } @@ -574,12 +321,27 @@ DCPTimeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - _menu.popup (_film, selected_content (), ev.GetPosition ()); + _menu.popup (_film, selected_content (), selected_views (), ev.GetPosition ()); +} + +void +Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) const +{ + DCPTime const d = a - b; + if (!nearest_distance || d.abs() < nearest_distance.get().abs()) { + nearest_distance = d; + } } void -DCPTimeline::set_position_from_event (wxMouseEvent& ev) +Timeline::set_position_from_event (wxMouseEvent& ev) { + if (!_pixels_per_second) { + return; + } + + double const pps = _pixels_per_second.get (); + wxPoint const p = ev.GetPosition(); if (!_first_move) { @@ -597,97 +359,84 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) return; } - DCPTime new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit; + DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps); if (_snap) { - - bool first = true; - DCPTime nearest_distance = TIME_MAX; - DCPTime nearest_new_position = TIME_MAX; + + DCPTime const new_end = new_position + _down_view->content()->length_after_trim () - DCPTime (1); + /* Signed `distance' to nearest thing (i.e. negative is left on the timeline, + positive is right). + */ + optional nearest_distance; /* Find the nearest content edge; this is inefficient */ - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (!cv || cv == _down_view) { + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv || cv == _down_view || cv->content() == _down_view->content()) { continue; } - - { - /* Snap starts to ends */ - DCPTime const d = abs (cv->content()->end() - new_position); - if (first || d < nearest_distance) { - nearest_distance = d; - nearest_new_position = cv->content()->end(); - } - } - - { - /* Snap ends to starts */ - DCPTime const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim())); - if (d < nearest_distance) { - nearest_distance = d; - nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim (); - } - } - - first = false; + + maybe_snap (cv->content()->position(), new_position, nearest_distance); + maybe_snap (cv->content()->position(), new_end + DCPTime (1), nearest_distance); + maybe_snap (cv->content()->end() + DCPTime (1), new_position, nearest_distance); + maybe_snap (cv->content()->end() + DCPTime (1), new_end, nearest_distance); } - if (!first) { + if (nearest_distance) { /* Snap if it's close; `close' means within a proportion of the time on the timeline */ - if (nearest_distance < (width() / pixels_per_time_unit()) / 32) { - new_position = nearest_new_position; + if (nearest_distance.get().abs() < DCPTime::from_seconds ((width() / pps) / 64)) { + new_position += nearest_distance.get (); } } } - if (new_position < 0) { - new_position = 0; + if (new_position < DCPTime ()) { + new_position = DCPTime (); } - + _down_view->content()->set_position (new_position); shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); film->set_sequence_video (false); } void -DCPTimeline::force_redraw (dcpomatic::Rect const & r) +Timeline::force_redraw (dcpomatic::Rect const & r) { RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } shared_ptr -DCPTimeline::film () const +Timeline::film () const { return _film.lock (); } void -DCPTimeline::resized () +Timeline::resized () { - setup_pixels_per_time_unit (); + setup_pixels_per_second (); } void -DCPTimeline::clear_selection () +Timeline::clear_selection () { - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (cv) { cv->set_selected (false); } } } -DCPTimeline::ContentViewList -DCPTimeline::selected_views () const +TimelineContentViewList +Timeline::selected_views () const { - ContentViewList sel; + TimelineContentViewList sel; - for (ViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (cv && cv->selected()) { sel.push_back (cv); } @@ -697,12 +446,12 @@ DCPTimeline::selected_views () const } ContentList -DCPTimeline::selected_content () const +Timeline::selected_content () const { ContentList sel; - ContentViewList views = selected_views (); + TimelineContentViewList views = selected_views (); - for (ContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { + for (TimelineContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { sel.push_back ((*i)->content ()); }