dropzone: honor AutoConnectMaster.
This commit is contained in:
parent
bdf9b2f47c
commit
9242ca7a64
@ -1287,8 +1287,12 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
|
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;
|
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());
|
rtav = axis_view_from_route (audio_tracks.front());
|
||||||
} else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
|
} else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
|
||||||
ChanCount one_midi_port (DataType::MIDI, 1);
|
ChanCount one_midi_port (DataType::MIDI, 1);
|
||||||
|
@ -1357,7 +1357,11 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
|
|||||||
try {
|
try {
|
||||||
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
|
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
|
||||||
list<boost::shared_ptr<AudioTrack> > audio_tracks;
|
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());
|
RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front());
|
||||||
if (rtav) {
|
if (rtav) {
|
||||||
rtav->set_height (original->current_height());
|
rtav->set_height (original->current_height());
|
||||||
|
Loading…
Reference in New Issue
Block a user