-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
#include <list>
#include <wx/graphics.h>
#include <boost/weak_ptr.hpp>
-#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;
using boost::dynamic_pointer_cast;
using boost::bind;
-class View
+class View : public boost::noncopyable
{
public:
View (Timeline& t)
- : _timeline (t)
+ : _timeline (t)
{
}
_timeline.force_redraw (bbox ());
}
- virtual Rect bbox () const = 0;
+ virtual dcpomatic::Rect<int> bbox () const = 0;
protected:
virtual void do_paint (wxGraphicsContext *) = 0;
Timeline& _timeline;
private:
- Rect _last_paint_bbox;
+ dcpomatic::Rect<int> _last_paint_bbox;
};
class ContentView : public View
, _track (t)
, _selected (false)
{
- c->Changed.connect (bind (&ContentView::content_changed, this, _2));
+ _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
}
- Rect bbox () const
+ dcpomatic::Rect<int> bbox () const
{
shared_ptr<const Film> film = _timeline.film ();
shared_ptr<const Content> content = _content.lock ();
if (!film || !content) {
- return Rect ();
+ return dcpomatic::Rect<int> ();
}
- return Rect (
+ return dcpomatic::Rect<int> (
time_x (content->start ()) - 8,
y_pos (_track) - 8,
content->length () * _timeline.pixels_per_time_unit() + 16,
return _selected;
}
- weak_ptr<Content> content () const {
- return _content;
+ shared_ptr<Content> content () const {
+ return _content.lock ();
+ }
+
+ void set_track (int t) {
+ _track = t;
+ }
+
+ int track () const {
+ return _track;
}
virtual wxString type () const = 0;
void do_paint (wxGraphicsContext* gc)
{
shared_ptr<const Film> film = _timeline.film ();
- shared_ptr<const Content> content = _content.lock ();
- if (!film || !content) {
+ shared_ptr<const Content> cont = content ();
+ if (!film || !cont) {
return;
}
- Time const start = content->start ();
- Time const len = content->length ();
+ Time const start = cont->start ();
+ Time const len = cont->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));
- 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 (cont->path().filename().string()).data(), type().data());
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;
return _timeline.tracks_position().y + t * _timeline.track_height();
}
- void content_changed (int p)
+ void content_changed (int p, bool frequent)
{
- if (p == ContentProperty::START || p == VideoContentProperty::VIDEO_LENGTH) {
+ ensure_ui_thread ();
+
+ if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
force_redraw ();
}
+
+ if (!frequent) {
+ _timeline.setup_pixels_per_time_unit ();
+ _timeline.Refresh ();
+ }
}
boost::weak_ptr<Content> _content;
int _track;
bool _selected;
+
+ boost::signals2::scoped_connection _content_connection;
};
class AudioContentView : public ContentView
wxString type () const
{
- return _("video");
+ if (dynamic_pointer_cast<FFmpegContent> (content ())) {
+ return _("video");
+ } else {
+ return _("still");
+ }
}
wxColour colour () const
{
public:
TimeAxisView (Timeline& tl, int y)
- : View (tl)
+ : View (tl)
, _y (y)
{}
+
+ dcpomatic::Rect<int> bbox () const
+ {
+ return dcpomatic::Rect<int> (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) {
}
}
- Rect bbox () const
- {
- return Rect (0, _y - 4, _timeline.width(), 24);
- }
-
private:
int _y;
};
-Timeline::Timeline (wxWindow* parent, shared_ptr<const Film> film)
+Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> 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)
+ , _menu (film, this)
{
+#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_RIGHT_DOWN, wxMouseEventHandler (Timeline::right_down), 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 ();
- film->playlist()->Changed.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
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
- for (list<shared_ptr<View> >::iterator i = _views.begin(); i != _views.end(); ++i) {
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
(*i)->paint (gc);
}
void
Timeline::playlist_changed ()
{
+ ensure_ui_thread ();
+
shared_ptr<const Film> 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<VideoContent> (*i)) {
_views.push_back (shared_ptr<View> (new VideoContentView (*this, *i, 0)));
}
if (dynamic_pointer_cast<AudioContent> (*i)) {
- _views.push_back (shared_ptr<View> (new AudioContentView (*this, *i, 1)));
+ _views.push_back (shared_ptr<View> (new AudioContentView (*this, *i, 0)));
}
}
- _views.push_back (shared_ptr<View> (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<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
+ if (cv) {
+ cv->set_track (0);
+ _tracks = 1;
+ }
+ }
+
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+ shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
+ if (!acv) {
+ continue;
+ }
+
+ shared_ptr<Content> acv_content = acv->content();
+
+ int t = 1;
+ while (1) {
+ ViewList::iterator j = _views.begin();
+ while (j != _views.end()) {
+ shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
+ if (!test) {
+ ++j;
+ continue;
+ }
+
+ shared_ptr<Content> 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
return;
}
- _pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length();
+ _pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length ();
}
-void
-Timeline::left_down (wxMouseEvent& ev)
+shared_ptr<View>
+Timeline::event_to_view (wxMouseEvent& ev)
{
- list<shared_ptr<View> >::iterator i = _views.begin();
- Position const p (ev.GetX(), ev.GetY());
+ ViewList::iterator i = _views.begin();
+ Position<int> const p (ev.GetX(), ev.GetY());
while (i != _views.end() && !(*i)->bbox().contains (p)) {
++i;
}
+ if (i == _views.end ()) {
+ return shared_ptr<View> ();
+ }
+
+ return *i;
+}
+
+void
+Timeline::left_down (wxMouseEvent& ev)
+{
+ shared_ptr<View> view = event_to_view (ev);
+ shared_ptr<ContentView> content_view = dynamic_pointer_cast<ContentView> (view);
+
_down_view.reset ();
- if (i != _views.end ()) {
+ if (content_view) {
+ _down_view = content_view;
+ _down_view_start = content_view->content()->start ();
+ }
+
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
- if (cv) {
- _down_view = cv;
- shared_ptr<Content> c = cv->content().lock();
- assert (c);
- _down_view_start = c->start ();
+ if (!cv) {
+ continue;
+ }
+
+ if (!ev.ShiftDown ()) {
+ cv->set_selected (view == *i);
+ }
+
+ if (view == *i) {
+ _film_editor->set_selection (cv->content ());
}
}
- for (list<shared_ptr<View> >::iterator j = _views.begin(); j != _views.end(); ++j) {
- shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*j);
- if (cv) {
- cv->set_selected (i == j);
- }
+ 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_start_from_event (ev);
}
void
return;
}
+ set_start_from_event (ev);
+}
+
+void
+Timeline::right_down (wxMouseEvent& ev)
+{
+ shared_ptr<View> view = event_to_view (ev);
+ shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (view);
+ if (!cv) {
+ return;
+ }
+
+ if (!cv->selected ()) {
+ clear_selection ();
+ cv->set_selected (true);
+ }
+
+ _menu.popup (selected_content (), ev.GetPosition ());
+}
+
+void
+Timeline::set_start_from_event (wxMouseEvent& ev)
+{
wxPoint const p = ev.GetPosition();
if (!_first_move) {
Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
if (_down_view) {
- shared_ptr<Content> c = _down_view->content().lock();
- if (c) {
- c->set_start (_down_view_start + time_diff);
- }
+ _down_view->content()->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
+
+ shared_ptr<Film> film = _film.lock ();
+ assert (film);
+ film->set_sequence_video (false);
}
}
void
-Timeline::force_redraw (Rect const & r)
+Timeline::force_redraw (dcpomatic::Rect<int> const & r)
{
RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
}
{
setup_pixels_per_time_unit ();
}
+
+void
+Timeline::clear_selection ()
+{
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+ shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*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<ContentView> cv = dynamic_pointer_cast<ContentView> (*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;
+}
projects / dcpomatic.git / blobdiff