X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=4b56168a1d0636be5d56642d212b8050e19b61ce;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=ac26c77a9125d7ab31c2a34620831d980b5d6bc4;hpb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index ac26c77a9..4b56168a1 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 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 @@ -35,11 +35,13 @@ 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 + * @brief 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) + View (Timeline& t) : _timeline (t) { @@ -66,24 +68,25 @@ protected: int time_x (DCPTime t) const { - return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); + return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); } - DCPTimeline& _timeline; + Timeline& _timeline; private: dcpomatic::Rect _last_paint_bbox; }; -/** Parent class for views of pieces of content */ +/** @class ContentView + * @brief Parent class for views of pieces of content. + */ class ContentView : public View { public: - ContentView (DCPTimeline& tl, shared_ptr c) + ContentView (Timeline& tl, shared_ptr c) : View (tl) , _content (c) - , _track (0) , _selected (false) { _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3)); @@ -91,6 +94,8 @@ public: dcpomatic::Rect bbox () const { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr content = _content.lock (); if (!film || !content) { @@ -99,8 +104,8 @@ public: return dcpomatic::Rect ( time_x (content->position ()) - 8, - y_pos (_track) - 8, - content->length_after_trim () * _timeline.pixels_per_time_unit() + 16, + y_pos (_track.get()) - 8, + content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0) + 16, _timeline.track_height() + 16 ); } @@ -122,7 +127,7 @@ public: _track = t; } - int track () const { + optional track () const { return _track; } @@ -133,6 +138,8 @@ private: void do_paint (wxGraphicsContext* gc) { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr cont = content (); if (!film || !cont) { @@ -154,11 +161,11 @@ private: } 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); + path.MoveToPoint (time_x (position), y_pos (_track.get()) + 4); + path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4); + path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position), y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position), y_pos (_track.get()) + 4); gc->StrokePath (path); gc->FillPath (path); @@ -169,8 +176,8 @@ private: 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->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.track_height())); + gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4); gc->ResetClip (); } @@ -188,13 +195,13 @@ private: } if (!frequent) { - _timeline.setup_pixels_per_time_unit (); + _timeline.setup_pixels_per_second (); _timeline.Refresh (); } } boost::weak_ptr _content; - int _track; + optional _track; bool _selected; boost::signals2::scoped_connection _content_connection; @@ -203,7 +210,7 @@ private: class AudioContentView : public ContentView { public: - AudioContentView (DCPTimeline& tl, shared_ptr c) + AudioContentView (Timeline& tl, shared_ptr c) : ContentView (tl, c) {} @@ -222,7 +229,7 @@ private: class VideoContentView : public ContentView { public: - VideoContentView (DCPTimeline& tl, shared_ptr c) + VideoContentView (Timeline& tl, shared_ptr c) : ContentView (tl, c) {} @@ -243,10 +250,29 @@ private: } }; -class DCPTimeAxisView : public View +class SubtitleContentView : public ContentView +{ +public: + SubtitleContentView (Timeline& tl, shared_ptr c) + : ContentView (tl, c) + {} + +private: + wxString type () const + { + return _("subtitles"); + } + + wxColour colour () const + { + return wxColour (163, 255, 154, 255); + } +}; + +class TimeAxisView : public View { public: - DCPTimeAxisView (DCPTimeline& tl, int y) + TimeAxisView (Timeline& tl, int y) : View (tl) , _y (y) {} @@ -266,20 +292,26 @@ private: void do_paint (wxGraphicsContext* gc) { + if (!_timeline.pixels_per_second()) { + return; + } + + double const pps = _timeline.pixels_per_second().get (); + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); + double mark_interval = rint (128 / pps); if (mark_interval > 5) { - mark_interval -= mark_interval % 5; + mark_interval -= int (rint (mark_interval)) % 5; } if (mark_interval > 10) { - mark_interval -= mark_interval % 10; + mark_interval -= int (rint (mark_interval)) % 10; } if (mark_interval > 60) { - mark_interval -= mark_interval % 60; + mark_interval -= int (rint (mark_interval)) % 60; } if (mark_interval > 3600) { - mark_interval -= mark_interval % 3600; + mark_interval -= int (rint (mark_interval)) % 3600; } if (mark_interval < 1) { @@ -291,14 +323,15 @@ private: path.AddLineToPoint (_timeline.width(), _y); gc->StrokePath (path); - DCPTime t = 0; - while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) { + /* Time in seconds */ + DCPTime t; + while ((t.seconds() * pps) < _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; + double tc = t.seconds (); int const h = tc / 3600; tc -= h * 3600; int const m = tc / 60; @@ -312,12 +345,12 @@ private: 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(); + int const tx = _timeline.x_offset() + t.seconds() * pps; if ((tx + str_width) < _timeline.width()) { gc->DrawText (str, time_x (t), _y + 16); } - t += mark_interval * TIME_HZ; + t += DCPTime::from_seconds (mark_interval); } } @@ -326,13 +359,12 @@ private: }; -DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) +Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _film_editor (ed) , _film (film) - , _time_axis_view (new DCPTimeAxisView (*this, 32)) + , _time_axis_view (new TimeAxisView (*this, 32)) , _tracks (0) - , _pixels_per_time_unit (0) , _left_down (false) , _down_view_position (0) , _first_move (false) @@ -343,22 +375,22 @@ 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_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); } void -DCPTimeline::paint () +Timeline::paint () { wxPaintDC dc (this); @@ -377,7 +409,7 @@ DCPTimeline::paint () } void -DCPTimeline::playlist_changed () +Timeline::playlist_changed () { ensure_ui_thread (); @@ -398,37 +430,32 @@ DCPTimeline::playlist_changed () if (dynamic_pointer_cast (*i)) { _views.push_back (shared_ptr (new AudioContentView (*this, *i))); } + if (dynamic_pointer_cast (*i)) { + _views.push_back (shared_ptr (new SubtitleContentView (*this, *i))); + } } assign_tracks (); - setup_pixels_per_time_unit (); + setup_pixels_per_second (); Refresh (); } void -DCPTimeline::assign_tracks () +Timeline::assign_tracks () { 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; - } - } - - for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + if (!cv) { continue; } - - shared_ptr acv_content = acv->content(); - int t = 1; - while (1) { + shared_ptr content = cv->content(); + + int t = 0; + while (true) { ViewList::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 +463,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 +484,7 @@ DCPTimeline::assign_tracks () } } - acv->set_track (t); + cv->set_track (t); _tracks = max (_tracks, t + 1); } @@ -465,24 +492,24 @@ 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) +Timeline::event_to_view (wxMouseEvent& ev) { ViewList::iterator i = _views.begin(); Position const p (ev.GetX(), ev.GetY()); @@ -498,7 +525,7 @@ DCPTimeline::event_to_view (wxMouseEvent& ev) } 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); @@ -539,7 +566,7 @@ DCPTimeline::left_down (wxMouseEvent& ev) } void -DCPTimeline::left_up (wxMouseEvent& ev) +Timeline::left_up (wxMouseEvent& ev) { _left_down = false; @@ -551,7 +578,7 @@ DCPTimeline::left_up (wxMouseEvent& ev) } void -DCPTimeline::mouse_moved (wxMouseEvent& ev) +Timeline::mouse_moved (wxMouseEvent& ev) { if (!_left_down) { return; @@ -561,7 +588,7 @@ 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); @@ -578,8 +605,14 @@ DCPTimeline::right_down (wxMouseEvent& ev) } 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,13 +630,13 @@ 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 nearest_distance = DCPTime::max (); + DCPTime nearest_new_position = DCPTime::max (); /* Find the nearest content edge; this is inefficient */ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { @@ -614,7 +647,7 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) { /* Snap starts to ends */ - DCPTime const d = abs (cv->content()->end() - new_position); + DCPTime const d = DCPTime (cv->content()->end() - new_position).abs (); if (first || d < nearest_distance) { nearest_distance = d; nearest_new_position = cv->content()->end(); @@ -623,7 +656,10 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) { /* Snap ends to starts */ - DCPTime const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim())); + DCPTime const d = DCPTime ( + cv->content()->position() - (new_position + _down_view->content()->length_after_trim()) + ).abs (); + if (d < nearest_distance) { nearest_distance = d; nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim (); @@ -635,14 +671,14 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) if (!first) { /* 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) { + if (nearest_distance < DCPTime::from_seconds ((width() / pps) / 32)) { new_position = nearest_new_position; } } } - if (new_position < 0) { - new_position = 0; + if (new_position < DCPTime ()) { + new_position = DCPTime (); } _down_view->content()->set_position (new_position); @@ -653,25 +689,25 @@ DCPTimeline::set_position_from_event (wxMouseEvent& ev) } 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); @@ -681,8 +717,8 @@ DCPTimeline::clear_selection () } } -DCPTimeline::ContentViewList -DCPTimeline::selected_views () const +Timeline::ContentViewList +Timeline::selected_views () const { ContentViewList sel; @@ -697,7 +733,7 @@ DCPTimeline::selected_views () const } ContentList -DCPTimeline::selected_content () const +Timeline::selected_content () const { ContentList sel; ContentViewList views = selected_views ();