X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=3747a3dac0c44574e271d4bac6afdf95ae07648c;hb=d6ab5a6677f1cc4ecadb78b4bbe2d42749d3728e;hp=42f489c2f5d438c4cdb96944ab821511b9a84793;hpb=6166c045a8de42edd09924fdd995a77a3b753e54;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 42f489c2f..3747a3dac 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -20,11 +20,11 @@ #include #include #include -#include "film.h" +#include "lib/film.h" +#include "lib/playlist.h" #include "film_editor.h" #include "timeline.h" #include "wx_util.h" -#include "lib/playlist.h" using std::list; using std::cout; @@ -34,11 +34,11 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; -class View +class View : public boost::noncopyable { public: View (Timeline& t) - : _timeline (t) + : _timeline (t) { } @@ -55,7 +55,7 @@ public: _timeline.force_redraw (bbox ()); } - virtual Rect bbox () const = 0; + virtual dcpomatic::Rect bbox () const = 0; protected: virtual void do_paint (wxGraphicsContext *) = 0; @@ -68,7 +68,7 @@ protected: Timeline& _timeline; private: - Rect _last_paint_bbox; + dcpomatic::Rect _last_paint_bbox; }; class ContentView : public View @@ -83,18 +83,17 @@ public: _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2)); } - Rect bbox () const + dcpomatic::Rect bbox () const { shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { - return Rect (); + if (!film) { + return dcpomatic::Rect (); } - return Rect ( - time_x (content->start ()) - 8, + return dcpomatic::Rect ( + time_x (_content->start ()) - 8, y_pos (_track) - 8, - content->length () * _timeline.pixels_per_time_unit() + 16, + _content->length () * _timeline.pixels_per_time_unit() + 16, _timeline.track_height() + 16 ); } @@ -108,7 +107,7 @@ public: return _selected; } - weak_ptr content () const { + shared_ptr content () const { return _content; } @@ -128,44 +127,34 @@ private: void do_paint (wxGraphicsContext* gc) { shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { + if (!film) { return; } - Time const start = content->start (); - Time const len = content->length (); + Time const start = _content->start (); + Time const len = _content->length (); wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2); gc->SetPen (*wxBLACK_PEN); -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 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)); } -#else - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxSOLID)); - if (_selected) { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxSOLID)); - } else { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxSOLID)); - } -#endif - + wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (start), y_pos (_track) + 4); + path.MoveToPoint (time_x (start), y_pos (_track) + 4); path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4); path.AddLineToPoint (time_x (start + len), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (start), y_pos (_track) + 4); + path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4); + path.AddLineToPoint (time_x (start), y_pos (_track) + 4); gc->StrokePath (path); gc->FillPath (path); - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (content->file().filename().string()).data(), type().data()); + wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (_content->file().filename().string()).data(), type().data()); wxDouble name_width; wxDouble name_height; wxDouble name_descent; @@ -189,7 +178,11 @@ private: } } - boost::weak_ptr _content; + /* This must be a shared_ptr, not a weak_ptr, as in the looped case this + will be the only remaining pointer to the looped content that we get + from the playlist. + */ + boost::shared_ptr _content; int _track; bool _selected; @@ -226,7 +219,11 @@ private: wxString type () const { - return _("video"); + if (dynamic_pointer_cast (content ())) { + return _("video"); + } else { + return _("still"); + } } wxColour colour () const @@ -239,17 +236,26 @@ class TimeAxisView : public View { public: TimeAxisView (Timeline& tl, int y) - : View (tl) + : 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) { -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); -#else - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxSOLID)); -#endif int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); if (mark_interval > 5) { @@ -304,11 +310,6 @@ public: } } - Rect bbox () const - { - return Rect (0, _y - 4, _timeline.width(), 24); - } - private: int _y; }; @@ -317,13 +318,16 @@ 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 TimeAxisView (*this, 32)) , _tracks (0) , _pixels_per_time_unit (0) , _left_down (false) , _down_view_start (0) , _first_move (false) { +#ifndef __WXOSX__ SetDoubleBuffered (true); +#endif setup_pixels_per_time_unit (); @@ -338,6 +342,8 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) SetMinSize (wxSize (640, tracks() * track_height() + 96)); _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + + _views.push_back (_time_axis_view); } void @@ -369,7 +375,7 @@ Timeline::playlist_changed () _views.clear (); - Playlist::ContentList content = fl->playlist()->content (); + Playlist::ContentList content = fl->playlist()->content_with_loop (); for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { if (dynamic_pointer_cast (*i)) { @@ -381,9 +387,6 @@ Timeline::playlist_changed () } assign_tracks (); - - _views.push_back (shared_ptr (new TimeAxisView (*this, tracks() * track_height() + 32))); - Refresh (); } @@ -394,6 +397,7 @@ Timeline::assign_tracks () shared_ptr cv = dynamic_pointer_cast (*i); if (cv) { cv->set_track (0); + _tracks = 1; } } @@ -403,8 +407,7 @@ Timeline::assign_tracks () continue; } - shared_ptr acv_content = acv->content().lock (); - assert (acv_content); + shared_ptr acv_content = acv->content(); int t = 1; while (1) { @@ -416,12 +419,11 @@ Timeline::assign_tracks () continue; } - shared_ptr test_content = test->content().lock (); - assert (test_content); + shared_ptr test_content = test->content(); if (test && test->track() == t) { - if ((acv_content->start() <= test_content->start() && test_content->start() <= acv_content->end()) || - (acv_content->start() <= test_content->end() && test_content->end() <= acv_content->end())) { + if ((acv_content->start() < test_content->start() && test_content->start() < acv_content->end()) || + (acv_content->start() < test_content->end() && test_content->end() < acv_content->end())) { /* we have an overlap on track `t' */ ++t; break; @@ -440,6 +442,8 @@ Timeline::assign_tracks () acv->set_track (t); _tracks = max (_tracks, t + 1); } + + _time_axis_view->set_y (tracks() * track_height() + 32); } int @@ -456,14 +460,14 @@ Timeline::setup_pixels_per_time_unit () return; } - _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length(); + _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length_with_loop(); } void Timeline::left_down (wxMouseEvent& ev) { list >::iterator i = _views.begin(); - Position const p (ev.GetX(), ev.GetY()); + Position const p (ev.GetX(), ev.GetY()); while (i != _views.end() && !(*i)->bbox().contains (p)) { ++i; } @@ -474,9 +478,7 @@ Timeline::left_down (wxMouseEvent& ev) shared_ptr cv = dynamic_pointer_cast (*i); if (cv) { _down_view = cv; - shared_ptr c = cv->content().lock(); - assert (c); - _down_view_start = c->start (); + _down_view_start = cv->content()->start (); } } @@ -493,12 +495,22 @@ Timeline::left_down (wxMouseEvent& ev) _left_down = true; _down_point = ev.GetPosition (); _first_move = false; + + if (_down_view) { + _down_view->content()->set_change_signals_frequent (true); + } } void -Timeline::left_up (wxMouseEvent &) +Timeline::left_up (wxMouseEvent& ev) { _left_down = false; + + if (_down_view) { + _down_view->content()->set_change_signals_frequent (false); + } + + set_start_from_event (ev); } void @@ -508,6 +520,12 @@ Timeline::mouse_moved (wxMouseEvent& ev) return; } + set_start_from_event (ev); +} + +void +Timeline::set_start_from_event (wxMouseEvent& ev) +{ wxPoint const p = ev.GetPosition(); if (!_first_move) { @@ -520,19 +538,16 @@ Timeline::mouse_moved (wxMouseEvent& ev) Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit; if (_down_view) { - shared_ptr c = _down_view->content().lock(); - if (c) { - c->set_start (max (static_cast