X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=0ac9a1d4bb6d513e6fa3bedbfe96eeae66441777;hb=13f17a79c3ff5fb7201534e64228a54314ab1619;hp=de15635b6c47fe2b212bd93272767c049fb3950e;hpb=ebd495da2fe5be8c07cf7fb52e8283bb7f4113c1;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index de15635b6..0ac9a1d4b 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 @@ -22,10 +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 "playlist.h" using std::list; using std::cout; @@ -34,146 +33,178 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; +using boost::optional; -class View +/** Parent class for components of the timeline (e.g. a piece of content or an axis) */ +class View : public boost::noncopyable { public: View (Timeline& t) - : _timeline (t) + : _timeline (t) { } - - virtual void paint (wxGraphicsContext *) = 0; - virtual Rect bbox () const = 0; + 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 (Time t) const { return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); } Timeline& _timeline; + +private: + dcpomatic::Rect _last_paint_bbox; }; + +/** Parent class for views of pieces of content */ class ContentView : public View { public: - ContentView (Timeline& tl, shared_ptr c, int t) + ContentView (Timeline& tl, shared_ptr c) : View (tl) , _content (c) - , _track (t) + , _track (0) , _selected (false) { - + _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3)); } - void paint (wxGraphicsContext* gc) + 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; } - Time const start = content->start (); - Time const len = content->length (); + Time const position = cont->position (); + Time const len = cont->length_after_trim (); 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)); - 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 (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 (content->file().filename().string()).data(), type().data()); + 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 (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->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 (); } - 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->start ()), - y_pos (_track), - content->length () * _timeline.pixels_per_time_unit(), - _timeline.track_height() - ); - } - - void set_selected (bool s) { - _selected = s; - force_redraw (); - } - - bool selected () const { - return _selected; - } - - weak_ptr content () const { - return _content; + 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, bool frequent) { - return _timeline.tracks_position().y + t * _timeline.track_height(); + 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 (Timeline& tl, shared_ptr c, int t) - : ContentView (tl, c, t) + AudioContentView (Timeline& tl, shared_ptr c) + : ContentView (tl, c) {} private: @@ -191,15 +222,19 @@ private: class VideoContentView : public ContentView { public: - VideoContentView (Timeline& tl, shared_ptr c, int t) - : ContentView (tl, c, t) + VideoContentView (Timeline& tl, shared_ptr c) + : ContentView (tl, c) {} private: wxString type () const { - return _("video"); + if (dynamic_pointer_cast (content ())) { + return _("video"); + } else { + return _("still"); + } } wxColour colour () const @@ -212,17 +247,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 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)); -#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) { @@ -277,43 +321,44 @@ 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) + , _down_view_position (0) , _first_move (false) + , _menu (film, this) + , _snap (true) { +#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); - - SetMinSize (wxSize (640, tracks() * track_height() + 96)); + 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 (); - film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); - film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_changed, this)); + SetMinSize (wxSize (640, tracks() * track_height() + 96)); + + _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); } void -Timeline::paint (wxPaintEvent &) +Timeline::paint () { wxPaintDC dc (this); @@ -324,7 +369,7 @@ Timeline::paint (wxPaintEvent &) gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { + for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { (*i)->paint (gc); } @@ -334,34 +379,95 @@ Timeline::paint (wxPaintEvent &) void Timeline::playlist_changed () { + ensure_ui_thread (); + shared_ptr fl = _film.lock (); if (!fl) { return; } _views.clear (); + _views.push_back (_time_axis_view); - Playlist::ContentList content = fl->playlist()->content (); + ContentList content = fl->playlist()->content (); - for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { + for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new VideoContentView (*this, *i, 0))); + _views.push_back (shared_ptr (new VideoContentView (*this, *i))); } if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i, 1))); + _views.push_back (shared_ptr (new AudioContentView (*this, *i))); } } - _views.push_back (shared_ptr (new TimeAxisView (*this, tracks() * track_height() + 32))); - + assign_tracks (); + setup_pixels_per_time_unit (); Refresh (); } +void +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) { + continue; + } + + shared_ptr acv_content = acv->content(); + + int t = 1; + while (1) { + ViewList::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) { + 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()); + + if (!no_overlap) { + /* 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 @@ -372,40 +478,76 @@ 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 (); } -void -Timeline::left_down (wxMouseEvent& ev) +shared_ptr +Timeline::event_to_view (wxMouseEvent& ev) { - list >::iterator i = _views.begin(); - Position const p (ev.GetX(), ev.GetY()); + ViewList::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 *i; +} + +void +Timeline::left_down (wxMouseEvent& ev) +{ + shared_ptr view = event_to_view (ev); + shared_ptr content_view = dynamic_pointer_cast (view); + _down_view.reset (); - for (list >::iterator j = _views.begin(); j != _views.end(); ++j) { - shared_ptr cv = dynamic_pointer_cast (*j); - if (cv) { - _down_view = cv; - shared_ptr c = cv->content().lock(); - assert (c); - _down_view_start = c->start (); - cv->set_selected (i == j); + if (content_view) { + _down_view = content_view; + _down_view_position = content_view->content()->position (); + } + + for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv) { + continue; + } + + if (!ev.ShiftDown ()) { + cv->set_selected (view == *i); } + + if (view == *i) { + _film_editor->set_selection (cv->content ()); + } + } + + if (content_view && ev.ShiftDown ()) { + content_view->set_selected (!content_view->selected ()); } _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_position_from_event (ev); } void @@ -415,9 +557,35 @@ Timeline::mouse_moved (wxMouseEvent& ev) return; } + set_position_from_event (ev); +} + +void +Timeline::right_down (wxMouseEvent& ev) +{ + shared_ptr view = event_to_view (ev); + shared_ptr cv = dynamic_pointer_cast (view); + if (!cv) { + return; + } + + if (!cv->selected ()) { + clear_selection (); + cv->set_selected (true); + } + + _menu.popup (selected_content (), ev.GetPosition ()); +} + +void +Timeline::set_position_from_event (wxMouseEvent& ev) +{ wxPoint const p = ev.GetPosition(); if (!_first_move) { + /* We haven't moved yet; in that case, we must move the mouse some reasonable distance + before the drag is considered to have started. + */ int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2)); if (dist < 8) { return; @@ -425,19 +593,67 @@ Timeline::mouse_moved (wxMouseEvent& ev) _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) { - _down_view->force_redraw (); - c->set_start (_down_view_start + time_diff); - _down_view->force_redraw (); + if (!_down_view) { + return; + } + + Time new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit; + + if (_snap) { + + bool first = true; + Time nearest_distance = TIME_MAX; + Time nearest_new_position = TIME_MAX; + + /* 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) { + continue; + } + + { + /* Snap starts to ends */ + Time 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 */ + Time 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; + } + + 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) { + new_position = nearest_new_position; + } } } + + if (new_position < 0) { + new_position = 0; + } + + _down_view->content()->set_position (new_position); + + shared_ptr film = _film.lock (); + assert (film); + film->set_sequence_video (false); } void -Timeline::force_redraw (Rect const & r) +Timeline::force_redraw (dcpomatic::Rect const & r) { RefreshRect (wxRect (r.x, r.y, r.width, r.height), false); } @@ -449,7 +665,46 @@ Timeline::film () const } void -Timeline::resized (wxSizeEvent &) +Timeline::resized () { setup_pixels_per_time_unit (); } + +void +Timeline::clear_selection () +{ + for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv) { + cv->set_selected (false); + } + } +} + +Timeline::ContentViewList +Timeline::selected_views () const +{ + ContentViewList sel; + + for (ViewList::const_iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv && cv->selected()) { + sel.push_back (cv); + } + } + + return sel; +} + +ContentList +Timeline::selected_content () const +{ + ContentList sel; + ContentViewList views = selected_views (); + + for (ContentViewList::const_iterator i = views.begin(); i != views.end(); ++i) { + sel.push_back ((*i)->content ()); + } + + return sel; +}