From 9242ca7a64cc1f418a7316afa16fea639f724dba Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 27 Mar 2015 19:01:19 +0100
Subject: [PATCH] dropzone: honor AutoConnectMaster.

---
 gtk2_ardour/editor_canvas_events.cc | 6 +++++-
 gtk2_ardour/editor_drag.cc          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 157f6cfe2d..8af5389e70 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -1287,8 +1287,12 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
 	} else {
 		try {
 			if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
+				uint32_t output_chan = region->n_channels();
+				if ((Config->get_output_auto_connect() & AutoConnectMaster) && session()->master_out()) {
+					output_chan =  session()->master_out()->n_inputs().n_audio();
+				}
 				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());
+				audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 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);
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 6f1abba69c..d0f9f260ee 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1357,7 +1357,11 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
 	try {
 		if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
 			list<boost::shared_ptr<AudioTrack> > audio_tracks;
-			audio_tracks = _editor->session()->new_audio_track (region->n_channels(), region->n_channels(), ARDOUR::Normal, 0, 1, region->name());
+			uint32_t output_chan = region->n_channels();
+			if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) {
+				output_chan =  _editor->session()->master_out()->n_inputs().n_audio();
+			}
+			audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name());
 			RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front());
 			if (rtav) {
 				rtav->set_height (original->current_height());
-- 
2.30.2