projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow file-browser in generic-plugin-GUI to expand.
[ardour.git]
/
gtk2_ardour
/
editor_canvas_events.cc
diff --git
a/gtk2_ardour/editor_canvas_events.cc
b/gtk2_ardour/editor_canvas_events.cc
index 157f6cfe2d9e3704fcf35afd7d8d7966598f7376..adb896af8b8235b46e08998f87f56338a8767cd3 100644
(file)
--- a/
gtk2_ardour/editor_canvas_events.cc
+++ b/
gtk2_ardour/editor_canvas_events.cc
@@
-695,6
+695,11
@@
Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, Automation
type = AutomationLineItem;
}
type = AutomationLineItem;
}
+ clicked_control_point = 0;
+ clicked_axisview = &al->trackview;
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+ clicked_regionview = 0;
+
return typed_event (item, event, type);
}
return typed_event (item, event, type);
}
@@
-976,7
+981,7
@@
Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, Re
}
bool
}
bool
-Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
+Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item,
Ardour
Marker* /*marker*/)
{
return typed_event (item, event, MarkerItem);
}
{
return typed_event (item, event, MarkerItem);
}
@@
-1287,8
+1292,12
@@
Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
} else {
try {
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
} 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;
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);
rtav = axis_view_from_route (audio_tracks.front());
} else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
ChanCount one_midi_port (DataType::MIDI, 1);