diff options
author | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:29 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:48 +0200 |
commit | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (patch) | |
tree | 9131785c3f5d4b419f127f9f6726b820d8de4fae /gtk2_ardour/editor_drag.cc | |
parent | b7c617b0578ec7e8d75dcd604c316459d6ac0708 (diff) |
enable videotimeline by default
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 1713fe58c0..8f992266e7 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -659,11 +659,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) RegionView* rv = i->view; - if (rv->region()->locked() -#ifdef WITH_VIDEOTIMELINE - || rv->region()->video_locked() -#endif - ) { + if (rv->region()->locked() || rv->region()->video_locked()) { continue; } @@ -934,11 +930,7 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed /* insert the regions into their new playlists */ for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { - if (i->view->region()->locked() -#ifdef WITH_VIDEOTIMELINE - || i->view->region()->video_locked() -#endif - ) { + if (i->view->region()->locked() || i->view->region()->video_locked()) { continue; } @@ -1017,11 +1009,7 @@ RegionMoveDrag::finished_no_copy ( RouteTimeAxisView* const dest_rtv = dynamic_cast<RouteTimeAxisView*> (_time_axis_views[i->time_axis_view]); double const dest_layer = i->layer; - if (rv->region()->locked() -#ifdef WITH_VIDEOTIMELINE - || rv->region()->video_locked() -#endif - ) { + if (rv->region()->locked() || rv->region()->video_locked()) { ++i; continue; } @@ -1610,8 +1598,6 @@ NoteResizeDrag::aborted (bool) } } -#ifdef WITH_VIDEOTIMELINE - AVDraggingView::AVDraggingView (RegionView* v) : view (v) { @@ -1623,16 +1609,12 @@ VideoTimeLineDrag::VideoTimeLineDrag (Editor* e, ArdourCanvas::Item* i) { DEBUG_TRACE (DEBUG::Drags, "New VideoTimeLineDrag\n"); - /* create a list of regions to move along */ -#if 1 /* all reagions -- with video_locked() */ RegionSelection rs; TrackViewList empty; empty.clear(); _editor->get_regions_after(rs, (framepos_t) 0, empty); std::list<RegionView*> views = rs.by_layer(); -#else /* selected regions -- with video_locked() */ - std::list<RegionView*> views = _editor->selection->regions.by_layer(); -#endif + for (list<RegionView*>::iterator i = views.begin(); i != views.end(); ++i) { RegionView* rv = (*i); if (!rv->region()->video_locked()) { @@ -1776,7 +1758,6 @@ VideoTimeLineDrag::aborted (bool) i->view->region()->set_position(i->initial_position); } } -#endif TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v, bool preserve_fade_anchor) : RegionDrag (e, i, p, v) |