/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
int time_x (Time t) const
{
- return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit();
+ return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit().get_value_or (0);
}
Timeline& _timeline;
ContentView (Timeline& tl, shared_ptr<Content> c)
: View (tl)
, _content (c)
- , _track (0)
, _selected (false)
{
_content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
dcpomatic::Rect<int> bbox () const
{
+ assert (_track);
+
shared_ptr<const Film> film = _timeline.film ();
shared_ptr<const Content> content = _content.lock ();
if (!film || !content) {
return dcpomatic::Rect<int> (
time_x (content->position ()) - 8,
- y_pos (_track) - 8,
- content->length_after_trim () * _timeline.pixels_per_time_unit() + 16,
+ y_pos (_track.get()) - 8,
+ content->length_after_trim () * _timeline.pixels_per_time_unit().get_value_or(0) + 16,
_timeline.track_height() + 16
);
}
_track = t;
}
- int track () const {
+ void unset_track () {
+ _track = boost::optional<int> ();
+ }
+
+ optional<int> track () const {
return _track;
}
void do_paint (wxGraphicsContext* gc)
{
+ assert (_track);
+
shared_ptr<const Film> film = _timeline.film ();
shared_ptr<const Content> cont = content ();
if (!film || !cont) {
}
wxGraphicsPath path = gc->CreatePath ();
- 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);
+ path.MoveToPoint (time_x (position), y_pos (_track.get()) + 4);
+ path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4);
+ path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4);
+ path.AddLineToPoint (time_x (position), y_pos (_track.get() + 1) - 4);
+ path.AddLineToPoint (time_x (position), y_pos (_track.get()) + 4);
gc->StrokePath (path);
gc->FillPath (path);
- wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path().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 (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->Clip (wxRegion (time_x (position), y_pos (_track.get()), len * _timeline.pixels_per_time_unit().get_value_or(0), _timeline.track_height()));
+ gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
gc->ResetClip ();
}
}
boost::weak_ptr<Content> _content;
- int _track;
+ optional<int> _track;
bool _selected;
boost::signals2::scoped_connection _content_connection;
void do_paint (wxGraphicsContext* gc)
{
+ if (!_timeline.pixels_per_time_unit()) {
+ return;
+ }
+
+ double const pptu = _timeline.pixels_per_time_unit().get ();
+
gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
- int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ()));
+ int mark_interval = rint (128 / (TIME_HZ * pptu));
if (mark_interval > 5) {
mark_interval -= mark_interval % 5;
}
gc->StrokePath (path);
Time t = 0;
- while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) {
+ while ((t * pptu) < _timeline.width()) {
wxGraphicsPath path = gc->CreatePath ();
path.MoveToPoint (time_x (t), _y - 4);
path.AddLineToPoint (time_x (t), _y + 4);
wxDouble str_leading;
gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
- int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit();
+ int const tx = _timeline.x_offset() + t * pptu;
if ((tx + str_width) < _timeline.width()) {
gc->DrawText (str, time_x (t), _y + 16);
}
, _film (film)
, _time_axis_view (new TimeAxisView (*this, 32))
, _tracks (0)
- , _pixels_per_time_unit (0)
, _left_down (false)
, _down_view_position (0)
, _first_move (false)
- , _menu (film, this)
+ , _menu (this)
, _snap (true)
{
#ifndef __WXOSX__
SetMinSize (wxSize (640, tracks() * track_height() + 96));
- _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+ _playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+ _playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2));
}
void
Refresh ();
}
+void
+Timeline::playlist_content_changed (int property)
+{
+ ensure_ui_thread ();
+
+ if (property == ContentProperty::POSITION) {
+ 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;
+ shared_ptr<ContentView> c = dynamic_pointer_cast<ContentView> (*i);
+ if (c) {
+ c->unset_track ();
}
}
for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
- shared_ptr<AudioContentView> acv = dynamic_pointer_cast<AudioContentView> (*i);
- if (!acv) {
+ shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
+ if (!cv) {
continue;
}
-
- shared_ptr<Content> acv_content = acv->content();
- int t = 1;
- while (1) {
+ shared_ptr<Content> content = cv->content();
+
+ int t = 0;
+ while (true) {
ViewList::iterator j = _views.begin();
while (j != _views.end()) {
- shared_ptr<AudioContentView> test = dynamic_pointer_cast<AudioContentView> (*j);
+ shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
if (!test) {
++j;
continue;
shared_ptr<Content> test_content = test->content();
- if (test && test->track() == t) {
+ if (test && test->track() && test->track().get() == 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());
+ (content->position() < test_content->position() && content->end() < test_content->position()) ||
+ (content->position() > test_content->end() && content->end() > test_content->end());
if (!no_overlap) {
/* we have an overlap on track `t' */
}
}
- acv->set_track (t);
+ cv->set_track (t);
_tracks = max (_tracks, t + 1);
}
Timeline::setup_pixels_per_time_unit ()
{
shared_ptr<const Film> film = _film.lock ();
- if (!film) {
+ if (!film || film->length() == 0) {
return;
}
cv->set_selected (true);
}
- _menu.popup (selected_content (), ev.GetPosition ());
+ _menu.popup (_film, selected_content (), ev.GetPosition ());
}
void
Timeline::set_position_from_event (wxMouseEvent& ev)
{
+ if (!_pixels_per_time_unit) {
+ return;
+ }
+
+ double const pptu = _pixels_per_time_unit.get ();
+
wxPoint const p = ev.GetPosition();
if (!_first_move) {
return;
}
- Time new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit;
+ Time new_position = _down_view_position + (p.x - _down_point.x) / pptu;
if (_snap) {
Time const d = abs (cv->content()->end() - new_position);
if (first || d < nearest_distance) {
nearest_distance = d;
- nearest_new_position = cv->content()->end();
+ nearest_new_position = cv->content()->end() + 1;
}
}
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 ();
+ nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - 1;
}
}
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) {
+ if (nearest_distance < (width() / pptu) / 32) {
new_position = nearest_new_position;
}
}
if (new_position < 0) {
new_position = 0;
}
-
+
_down_view->content()->set_position (new_position);
shared_ptr<Film> film = _film.lock ();