X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=6eba7f7936ceb619864f11552a4befaffa3b8ba3;hb=642a967bcec325ac01f01a22c63c24bf670e2ee3;hp=56a40378ea3ef60254f80df98dac25a0313501de;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 56a40378e..6eba7f793 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,3 @@ -/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ - /* Copyright (C) 2013 Carl Hetherington @@ -21,90 +19,142 @@ #include #include -#include "film.h" +#include +#include "lib/film.h" +#include "lib/playlist.h" +#include "film_editor.h" #include "timeline.h" #include "wx_util.h" -#include "playlist.h" using std::list; using std::cout; using std::max; using boost::shared_ptr; +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) { } - virtual void paint (wxGraphicsContext *) = 0; - virtual Rect bbox () const = 0; + 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 (Time t) const { return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); } Timeline& _timeline; + +private: + dcpomatic::Rect _last_paint_bbox; }; class ContentView : public View { public: - ContentView (Timeline& tl, shared_ptr c, int t) + ContentView (Timeline& tl, shared_ptr c, int t) : View (tl) , _content (c) , _track (t) , _selected (false) { + _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2)); + } + + dcpomatic::Rect bbox () const + { + shared_ptr film = _timeline.film (); + if (!film) { + return dcpomatic::Rect (); + } + + return dcpomatic::Rect ( + time_x (_content->start ()) - 8, + y_pos (_track) - 8, + _content->length () * _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; + } + + void set_track (int t) { + _track = t; + } + + int track () const { + return _track; + } + + virtual wxString type () const = 0; + virtual wxColour colour () const = 0; + +private: - void paint (wxGraphicsContext* gc) + 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->time (); - Time const len = content->length (film); + 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 (wxColour (200, 200, 200), wxBRUSHSTYLE_SOLID)); + 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 (wxColour (200, 200, 200), wxSOLID)); - } else { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxSOLID)); - } -#endif - + wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (start), y_pos (_track)); - path.AddLineToPoint (time_x (start + len), y_pos (_track)); - path.AddLineToPoint (time_x (start + len), y_pos (_track + 1)); - path.AddLineToPoint (time_x (start), y_pos (_track + 1)); - path.AddLineToPoint (time_x (start), y_pos (_track)); + 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); 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; @@ -116,50 +166,33 @@ public: gc->ResetClip (); } - Rect bbox () const + int y_pos (int t) const { - shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); - if (!film || !content) { - return Rect (); - } - - return Rect ( - time_x (content->time ()), - y_pos (_track), - content->length (film) * _timeline.pixels_per_time_unit(), - _timeline.track_height() - ); - } - - void set_selected (bool s) { - _selected = s; - _timeline.force_redraw (bbox ()); - } - - bool selected () const { - return _selected; + return _timeline.tracks_position().y + t * _timeline.track_height(); } - virtual wxString type () const = 0; - virtual wxColour colour () const = 0; - -private: - - int y_pos (int t) const + void content_changed (int p) { - return _timeline.tracks_position().y + t * _timeline.track_height(); + if (p == ContentProperty::START || p == ContentProperty::LENGTH) { + force_redraw (); + } } - 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; + + boost::signals2::scoped_connection _content_connection; }; class AudioContentView : public ContentView { public: - AudioContentView (Timeline& tl, shared_ptr c, int t) + AudioContentView (Timeline& tl, shared_ptr c, int t) : ContentView (tl, c, t) {} @@ -178,7 +211,7 @@ private: class VideoContentView : public ContentView { public: - VideoContentView (Timeline& tl, shared_ptr c, int t) + VideoContentView (Timeline& tl, shared_ptr c, int t) : ContentView (tl, c, t) {} @@ -199,17 +232,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 paint (wxGraphicsContext* gc) + 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) { @@ -264,34 +306,40 @@ public: } } - Rect bbox () const - { - return Rect (0, _y - 4, _timeline.width(), 24); - } - private: int _y; }; -Timeline::Timeline (wxWindow* parent, 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 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 (); Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (Timeline::paint), 0, this); Connect (wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler (Timeline::left_down), 0, this); + Connect (wxID_ANY, wxEVT_LEFT_UP, wxMouseEventHandler (Timeline::left_up), 0, this); + Connect (wxID_ANY, wxEVT_MOTION, wxMouseEventHandler (Timeline::mouse_moved), 0, this); Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Timeline::resized), 0, this); + playlist_changed (); + SetMinSize (wxSize (640, tracks() * track_height() + 96)); - playlist_changed (); + _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); - film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); - film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_changed, this)); + _views.push_back (_time_axis_view); } void @@ -323,27 +371,81 @@ 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)) { _views.push_back (shared_ptr (new VideoContentView (*this, *i, 0))); } if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i, 1))); + _views.push_back (shared_ptr (new AudioContentView (*this, *i, 0))); } } - _views.push_back (shared_ptr (new TimeAxisView (*this, tracks() * track_height() + 32))); - + assign_tracks (); Refresh (); } +void +Timeline::assign_tracks () +{ + for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv) { + cv->set_track (0); + _tracks = 1; + } + } + + for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr acv = dynamic_pointer_cast (*i); + if (!acv) { + continue; + } + + shared_ptr acv_content = acv->content(); + + int t = 1; + while (1) { + list >::iterator j = _views.begin(); + while (j != _views.end()) { + shared_ptr test = dynamic_pointer_cast (*j); + if (!test) { + ++j; + continue; + } + + 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())) { + /* we have an overlap on track `t' */ + ++t; + break; + } + } + + ++j; + } + + if (j == _views.end ()) { + /* no overlap on `t' */ + break; + } + } + + acv->set_track (t); + _tracks = max (_tracks, t + 1); + } + + _time_axis_view->set_y (tracks() * track_height() + 32); +} + int Timeline::tracks () const { - /* XXX */ - return 2; + return _tracks; } void @@ -354,28 +456,94 @@ 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; } + _down_view.reset (); + + if (i != _views.end ()) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv) { + _down_view = cv; + _down_view_start = cv->content()->start (); + } + } + for (list >::iterator j = _views.begin(); j != _views.end(); ++j) { shared_ptr cv = dynamic_pointer_cast (*j); if (cv) { cv->set_selected (i == j); + if (i == j) { + _film_editor->set_selection (cv->content ()); + } + } + } + + _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& ev) +{ + _left_down = false; + + if (_down_view) { + _down_view->content()->set_change_signals_frequent (false); + } + + set_start_from_event (ev); +} + +void +Timeline::mouse_moved (wxMouseEvent& ev) +{ + if (!_left_down) { + return; + } + + set_start_from_event (ev); +} + +void +Timeline::set_start_from_event (wxMouseEvent& ev) +{ + wxPoint const p = ev.GetPosition(); + + if (!_first_move) { + int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2)); + if (dist < 8) { + return; } + _first_move = true; + } + + Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit; + if (_down_view) { + _down_view->content()->set_start (max (static_cast