projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move duplicated AudioFileSource::Flags and SMFSource::Flags into Source.
[ardour.git]
/
gtk2_ardour
/
editor_canvas.cc
diff --git
a/gtk2_ardour/editor_canvas.cc
b/gtk2_ardour/editor_canvas.cc
index 62de67cd2214e739fe1da6fceee2e8be92509a12..848c66320064885d2860470f9cb692acaadea984 100644
(file)
--- a/
gtk2_ardour/editor_canvas.cc
+++ b/
gtk2_ardour/editor_canvas.cc
@@
-462,10
+462,10
@@
Editor::idle_drop_paths (vector<ustring> paths, nframes64_t frame, double ypos)
void
Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, double ypos)
{
void
Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, double ypos)
{
- TimeAxisView* tvp;
- AudioTimeAxisView* tv;
+ RouteTimeAxisView* tv;
- if ((tvp = trackview_by_y_position (ypos)) == 0) {
+ std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos);
+ if (tvp.first == 0) {
/* drop onto canvas background: create new tracks */
/* drop onto canvas background: create new tracks */
@@
-477,7
+477,7
@@
Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, do
do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
}
do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
}
- } else if ((tv = dynamic_cast<
AudioTimeAxisView*>(tvp
)) != 0) {
+ } else if ((tv = dynamic_cast<
RouteTimeAxisView*> (tvp.first
)) != 0) {
/* check that its an audio track, not a bus */
/* check that its an audio track, not a bus */