diff options
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 701181d009..e069d9f6c5 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -660,11 +660,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; } @@ -931,11 +927,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; } @@ -1014,11 +1006,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; } @@ -1612,8 +1600,6 @@ NoteResizeDrag::aborted (bool) } } -#ifdef WITH_VIDEOTIMELINE - AVDraggingView::AVDraggingView (RegionView* v) : view (v) { @@ -1625,16 +1611,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()) { @@ -1778,7 +1760,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) |