implement drags from off-canvas to the drop-zone.

fixes #6195 #6205

1 files changed, 43 insertions, 28 deletions

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 7b0adaa4ad..9b474870a3 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -24,6 +24,8 @@
 
 #include "pbd/stacktrace.h"
 
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
 #include "ardour/midi_region.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
@@ -1207,6 +1209,18 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 		region = _regions->get_dragged_region ();
 		
 		if (region) {
+
+			if (tv.first == 0
+			    && (
+			        boost::dynamic_pointer_cast<AudioRegion> (region) != 0 ||
+			        boost::dynamic_pointer_cast<MidiRegion> (region) != 0
+			       )
+			   )
+			{
+				/* drop to drop-zone */
+				context->drag_status (context->get_suggested_action(), time);
+				return true;
+			}
 			
 			if ((boost::dynamic_pointer_cast<AudioRegion> (region) != 0 &&
 			     dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
@@ -1251,9 +1265,6 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
 		      const SelectionData& /*data*/,
 		      guint /*info*/, guint /*time*/)
 {
-	boost::shared_ptr<Region> region;
-	boost::shared_ptr<Region> region_copy;
-	RouteTimeAxisView* rtav;
 	GdkEvent event;
 	double px;
 	double py;
@@ -1263,39 +1274,43 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
 	event.button.y = y;
 	/* assume we're dragging with button 1 */
 	event.motion.state = Gdk::BUTTON1_MASK;
-
 	framepos_t const pos = window_event_sample (&event, &px, &py);
 
+	boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+	if (!region) { return; }
+
+	RouteTimeAxisView* rtav = 0;
 	std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py, false);
 
 	if (tv.first != 0) {
-
 		rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
-		
-		if (rtav != 0 && rtav->is_track ()) {
-
-			boost::shared_ptr<Region> region = _regions->get_dragged_region ();
-			
-			if (region) {
-
-				region_copy = RegionFactory::create (region, true);
-	
-
-				if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
-				    dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
-				    (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 &&
-				     dynamic_cast<MidiTimeAxisView*> (tv.first) != 0)) {
-
-					/* audio to audio 
-					   OR 
-					   midi to midi
-					*/
+	} else {
+		try {
+			if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
+				list<boost::shared_ptr<AudioTrack> > audio_tracks;
+				audio_tracks = session()->new_audio_track (region->n_channels(), region->n_channels(), ARDOUR::Normal, 0, 1, region->name());
+				rtav = axis_view_from_route (audio_tracks.front());
+			} else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
+				ChanCount one_midi_port (DataType::MIDI, 1);
+				list<boost::shared_ptr<MidiTrack> > midi_tracks;
+				midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(), ARDOUR::Normal, 0, 1, region->name());
+				rtav = axis_view_from_route (midi_tracks.front());
+			} else {
+				return;
+			}
+		} catch (...) {
+			error << _("Could not create new track after region placed in the drop zone") << endmsg;
+			return;
+		}
+	}
 
+	if (rtav != 0 && rtav->is_track ()) {
+		boost::shared_ptr<Region> region_copy = RegionFactory::create (region, true);
 
-					_drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
-					_drags->end_grab (0);
-				}
-			}
+		if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 && dynamic_cast<AudioTimeAxisView*> (rtav) != 0) ||
+		    (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 && dynamic_cast<MidiTimeAxisView*> (rtav) != 0)) {
+			_drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
+			_drags->end_grab (0);
 		}
 	}
 }