diff options
| author | Robin Gareus <robin@gareus.org> | 2015-03-27 19:01:19 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-03-30 09:18:59 -0500 |
| commit | 8db5aa5a50d34ac73f1f792d31a2b1a1b0fb3f4d (patch) | |
| tree | 119ba5c1cbb494fefe4776645c5bd04bb854f95f /gtk2_ardour | |
| parent | 97ae714f8f5a8879cbe26c09123a996c3b05c26f (diff) | |
dropzone: honor AutoConnectMaster.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 6 | ||||
| -rw-r--r-- | 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()); |