From 8473bd72e1c3084a185c69e925f59b014ef2090c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Jun 2014 13:37:59 -0400 Subject: [PATCH] remove unused code Conflicts: gtk2_ardour/editor_ops.cc --- gtk2_ardour/editor.h | 3 -- gtk2_ardour/editor_ops.cc | 84 --------------------------------------- 2 files changed, 87 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 76726eaf51..c6cbdce8c7 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1222,11 +1222,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void temporal_zoom_by_slider (); void update_temporal_zoom_slider (); - void insert_region_list_drag (boost::shared_ptr, int x, int y); void insert_region_list_selection (float times); - void insert_route_list_drag (boost::shared_ptr, int x, int y); - /* import & embed */ void add_external_audio_action (Editing::ImportMode); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 3de89da988..8d0f22aa52 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2141,90 +2141,6 @@ Editor::unhide_ranges () } } -/* INSERT/REPLACE */ - -void -Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) -{ - double cx, cy; - framepos_t where; - RouteTimeAxisView *rtv = 0; - boost::shared_ptr playlist; - - GdkEvent event; - event.type = GDK_BUTTON_RELEASE; - event.button.x = x; - event.button.y = y; - - where = window_event_sample (&event, &cx, &cy); - - if (where < leftmost_frame || where > leftmost_frame + current_page_samples()) { - /* clearly outside canvas area */ - return; - } - - std::pair tv = trackview_by_y_position (cy); - if (tv.first == 0) { - return; - } - - if ((rtv = dynamic_cast (tv.first)) == 0) { - return; - } - - if ((playlist = rtv->playlist()) == 0) { - return; - } - - snap_to (where); - - begin_reversible_command (_("insert dragged region")); - playlist->clear_changes (); - playlist->add_region (RegionFactory::create (region, true), where, 1.0); - if (Config->get_edit_mode() == Ripple) - playlist->ripple (where, region->length(), boost::shared_ptr()); - - _session->add_command(new StatefulDiffCommand (playlist)); - commit_reversible_command (); -} - -void -Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) -{ - double cx, cy; - RouteTimeAxisView *dest_rtv = 0; - RouteTimeAxisView *source_rtv = 0; - - GdkEvent event; - event.type = GDK_BUTTON_RELEASE; - event.button.x = x; - event.button.y = y; - - window_event_sample (&event, &cx, &cy); - - std::pair const tv = trackview_by_y_position (cy); - if (tv.first == 0) { - return; - } - - if ((dest_rtv = dynamic_cast (tv.first)) == 0) { - return; - } - - /* use this drag source to add underlay to a track. But we really don't care - about the Route, only the view of the route, so find it first */ - for(TrackViewList::iterator it = track_views.begin(); it != track_views.end(); ++it) { - if((source_rtv = dynamic_cast(*it)) == 0) { - continue; - } - - if(source_rtv->route() == route && source_rtv != dest_rtv) { - dest_rtv->add_underlay(source_rtv->view()); - break; - } - } -} - void Editor::insert_region_list_selection (float times) {