X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=96bd2ccd4866a9585875b7cf8b232d7e5eefacff;hb=5ece2775cee162d7523a5318663a6dd8f7e52651;hp=731e721689e3703776359ff5695532727217621c;hpb=bdbddbe89d4996a39dc6e695f23a6457c03774ae;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 731e72168..96bd2ccd4 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,3 +1,5 @@ +/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ + /* Copyright (C) 2013 Carl Hetherington @@ -19,6 +21,8 @@ #include #include +#include +#include "film.h" #include "timeline.h" #include "wx_util.h" #include "playlist.h" @@ -27,6 +31,7 @@ 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; @@ -39,64 +44,117 @@ public: } - virtual void paint (wxGraphicsContext *) = 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 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_second(); + return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); } Timeline& _timeline; + +private: + Rect _last_paint_bbox; }; class ContentView : public View { public: - ContentView (Timeline& tl, boost::shared_ptr c, Time s, int t) + ContentView (Timeline& tl, shared_ptr c, int t) : View (tl) , _content (c) - , _start (s) , _track (t) , _selected (false) { + c->Changed.connect (bind (&ContentView::content_changed, this, _2)); + } + + Rect bbox () const + { + shared_ptr film = _timeline.film (); + shared_ptr content = _content.lock (); + if (!film || !content) { + return Rect (); + } + + return 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; + } + weak_ptr content () const { + return _content; } - void paint (wxGraphicsContext* gc) + virtual wxString type () const = 0; + virtual wxColour colour () const = 0; + +private: + + void do_paint (wxGraphicsContext* gc) { + shared_ptr film = _timeline.film (); shared_ptr content = _content.lock (); - if (!content) { + if (!film || !content) { return; } - - Time const len = content->temporal_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 (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)); + 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)); - 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)); + 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)); gc->StrokePath (path); gc->FillPath (path); @@ -107,42 +165,24 @@ public: wxDouble name_leading; gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading); - gc->Clip (wxRegion (time_x (_start), y_pos (_track), len * _timeline.pixels_per_second(), _timeline.track_height())); - gc->DrawText (name, time_x (_start) + 12, y_pos (_track + 1) - name_height - 4); + gc->Clip (wxRegion (time_x (start), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height())); + gc->DrawText (name, time_x (start) + 12, y_pos (_track + 1) - name_height - 4); gc->ResetClip (); } - Rect bbox () const + int y_pos (int t) const { - shared_ptr content = _content.lock (); - if (!content) { - return Rect (); - } - - return Rect (time_x (_start), y_pos (_track), content->temporal_length() * _timeline.pixels_per_second(), _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 == VideoContentProperty::VIDEO_LENGTH) { + force_redraw (); + } } - boost::weak_ptr _content; - Time _start; + boost::weak_ptr _content; int _track; bool _selected; }; @@ -150,8 +190,8 @@ private: class AudioContentView : public ContentView { public: - AudioContentView (Timeline& tl, boost::shared_ptr c, Time s, int t) - : ContentView (tl, c, s, t) + AudioContentView (Timeline& tl, shared_ptr c, int t) + : ContentView (tl, c, t) {} private: @@ -169,8 +209,8 @@ private: class VideoContentView : public ContentView { public: - VideoContentView (Timeline& tl, boost::shared_ptr c, Time s, int t) - : ContentView (tl, c, s, t) + VideoContentView (Timeline& tl, shared_ptr c, int t) + : ContentView (tl, c, t) {} private: @@ -194,7 +234,7 @@ public: , _y (y) {} - void paint (wxGraphicsContext* gc) + void do_paint (wxGraphicsContext* gc) { #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); @@ -202,7 +242,7 @@ public: gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxSOLID)); #endif - int mark_interval = rint (128 / _timeline.pixels_per_second ()); + int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); if (mark_interval > 5) { mark_interval -= mark_interval % 5; } @@ -226,13 +266,13 @@ public: gc->StrokePath (path); Time t = 0; - while ((t * _timeline.pixels_per_second()) < _timeline.width()) { + 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; + int tc = t / TIME_HZ; int const h = tc / 3600; tc -= h * 3600; int const m = tc / 60; @@ -246,11 +286,12 @@ public: wxDouble str_leading; gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - int const tx = _timeline.x_offset() + t * _timeline.pixels_per_second(); + 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; + + t += mark_interval * TIME_HZ; } } @@ -263,24 +304,29 @@ private: int _y; }; -Timeline::Timeline (wxWindow* parent, shared_ptr pl) - : wxPanel (parent) - , _playlist (pl) - , _pixels_per_second (0) +Timeline::Timeline (wxWindow* parent, shared_ptr film) + : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) + , _film (film) + , _pixels_per_time_unit (0) + , _left_down (false) + , _down_view_start (0) + , _first_move (false) { SetDoubleBuffered (true); - setup_pixels_per_second (); + 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); SetMinSize (wxSize (640, tracks() * track_height() + 96)); playlist_changed (); - pl->Changed.connect (bind (&Timeline::playlist_changed, this)); - pl->ContentChanged.connect (bind (&Timeline::playlist_changed, this)); + film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); } void @@ -288,11 +334,6 @@ Timeline::paint (wxPaintEvent &) { wxPaintDC dc (this); - shared_ptr pl = _playlist.lock (); - if (!pl) { - return; - } - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); if (!gc) { return; @@ -300,9 +341,6 @@ Timeline::paint (wxPaintEvent &) gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); - /* XXX */ - _pixels_per_second = (width() - x_offset() * 2) / (pl->content_length() / pl->video_frame_rate()); - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { (*i)->paint (gc); } @@ -313,30 +351,21 @@ Timeline::paint (wxPaintEvent &) void Timeline::playlist_changed () { - shared_ptr pl = _playlist.lock (); - if (!pl) { + shared_ptr fl = _film.lock (); + if (!fl) { return; } _views.clear (); - - int track = 0; - Time time = 0; - list > vc = pl->video (); - for (list >::const_iterator i = vc.begin(); i != vc.end(); ++i) { - _views.push_back (shared_ptr (new VideoContentView (*this, *i, time, track))); - time += (*i)->temporal_length (); - } - ++track; - time = 0; - list > ac = pl->audio (); - for (list >::const_iterator i = ac.begin(); i != ac.end(); ++i) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i, time, track))); - if (pl->audio_from() != Playlist::AUDIO_FFMPEG) { - ++track; - } else { - time += (*i)->temporal_length (); + Playlist::ContentList content = fl->playlist()->content (); + + 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))); } } @@ -348,28 +377,19 @@ Timeline::playlist_changed () int Timeline::tracks () const { - shared_ptr pl = _playlist.lock (); - if (!pl) { - return 0; - } - - if (pl->audio_from() == Playlist::AUDIO_FFMPEG) { - return 2; - } - - return 1 + max (size_t (1), pl->audio().size()); + /* XXX */ + return 2; } void -Timeline::setup_pixels_per_second () +Timeline::setup_pixels_per_time_unit () { - shared_ptr pl = _playlist.lock (); - if (!pl) { + shared_ptr film = _film.lock (); + if (!film) { return; } - /* XXX */ - _pixels_per_second = (width() - x_offset() * 2) / (pl->content_length() / pl->video_frame_rate()); + _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length(); } void @@ -381,12 +401,60 @@ Timeline::left_down (wxMouseEvent& ev) ++i; } + _down_view.reset (); + + if (i != _views.end ()) { + 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 (); + } + } + for (list >::iterator j = _views.begin(); j != _views.end(); ++j) { shared_ptr cv = dynamic_pointer_cast (*j); if (cv) { cv->set_selected (i == j); } } + + _left_down = true; + _down_point = ev.GetPosition (); + _first_move = false; +} + +void +Timeline::left_up (wxMouseEvent &) +{ + _left_down = false; +} + +void +Timeline::mouse_moved (wxMouseEvent& ev) +{ + if (!_left_down) { + return; + } + + 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) { + shared_ptr c = _down_view->content().lock(); + if (c) { + c->set_start (_down_view_start + time_diff); + } + } } void @@ -394,3 +462,15 @@ Timeline::force_redraw (Rect const & r) { RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } + +shared_ptr +Timeline::film () const +{ + return _film.lock (); +} + +void +Timeline::resized (wxSizeEvent &) +{ + setup_pixels_per_time_unit (); +}