_main_canvas->Bind (wxEVT_SCROLLWIN_PAGEDOWN, boost::bind (&Timeline::scrolled, this, _1));
_main_canvas->Bind (wxEVT_SCROLLWIN_THUMBTRACK, boost::bind (&Timeline::scrolled, this, _1));
- film_change (ChangeType::DONE, Film::CONTENT);
+ film_change (ChangeType::DONE, Film::Property::CONTENT);
SetMinSize (wxSize (640, 4 * pixels_per_track() + 96));
list<dcpomatic::Rect<int>> overlaps;
for (auto j: _views) {
auto jc = dynamic_pointer_cast<TimelineContentView> (j);
- /* No overlap with non-content views, views no different tracks, audio views or non-active views */
+ /* No overlap with non-content views, views on different tracks, audio views or non-active views */
if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) {
continue;
}
return;
}
- if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) {
+ if (p == Film::Property::CONTENT || p == Film::Property::REEL_TYPE || p == Film::Property::REEL_LENGTH) {
ensure_ui_thread ();
recreate_views ();
- } else if (p == Film::CONTENT_ORDER) {
+ } else if (p == Film::Property::CONTENT_ORDER) {
Refresh ();
}
}