, _track (t)
, _selected (false)
{
- _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2));
+ _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
}
dcpomatic::Rect<int> bbox () const
{
shared_ptr<const Film> film = _timeline.film ();
- if (!film) {
+ shared_ptr<const Content> content = _content.lock ();
+ if (!film || !content) {
return dcpomatic::Rect<int> ();
}
return dcpomatic::Rect<int> (
- time_x (_content->start ()) - 8,
+ 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
);
}
}
shared_ptr<Content> content () const {
- return _content;
+ return _content.lock ();
}
void set_track (int t) {
void do_paint (wxGraphicsContext* gc)
{
shared_ptr<const Film> film = _timeline.film ();
- if (!film) {
+ 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->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)
{
+ ensure_ui_thread ();
+
if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
force_redraw ();
}
+
+ if (!frequent) {
+ _timeline.setup_pixels_per_time_unit ();
+ _timeline.Refresh ();
+ }
}
- /* 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> _content;
+ boost::weak_ptr<Content> _content;
int _track;
bool _selected;
, _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_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
-
- _views.push_back (_time_axis_view);
}
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)));
}
}
assign_tracks ();
+ setup_pixels_per_time_unit ();
Refresh ();
}
void
Timeline::assign_tracks ()
{
- for (list<shared_ptr<View> >::iterator i = _views.begin(); i != _views.end(); ++i) {
+ 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);
}
}
- for (list<shared_ptr<View> >::iterator i = _views.begin(); i != _views.end(); ++i) {
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
if (!acv) {
continue;
int t = 1;
while (1) {
- list<shared_ptr<View> >::iterator j = _views.begin();
+ ViewList::iterator j = _views.begin();
while (j != _views.end()) {
shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
if (!test) {
_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();
+ 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;
- _down_view_start = cv->content()->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 (i == j) {
- _film_editor->set_selection (cv->content ());
- }
- }
+ if (content_view && ev.ShiftDown ()) {
+ content_view->set_selected (!content_view->selected ());
}
_left_down = true;
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)
{
{
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