Categorize the mixer actions.

[ardour.git] / gtk2_ardour / editor_canvas.cc

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 40ca1dbf22fd8880104fdbde8b17df2b67088457..f847a3f70722f329a84027ea7801a570a45cbedc 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -51,10 +51,11 @@
 #include "keyboard.h"
 #include "editor_cursors.h"
 #include "mouse_cursors.h"
+#include "note_base.h"
 #include "ui_config.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -410,10 +411,11 @@ Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, doub
 
                frame = 0;
                InstrumentSelector is; // instantiation builds instrument-list and sets default.
-               do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame, is.selected_instrument());
+               do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, SMFTrackName, SMFTempoIgnore, frame, is.selected_instrument());
 
                if (UIConfiguration::instance().get_only_copy_imported_files() || copy) {
-                       do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame);
+                       do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, 
+                                  SrcBest, SMFTrackName, SMFTempoIgnore, frame);
                } else {
                        do_embed (audio_paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
                }
@@ -426,10 +428,12 @@ Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, doub
                        /* select the track, then embed/import */
                        selection->set (tv);
 
-                       do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, SrcBest, frame);
+                       do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack,
+                                  SrcBest, SMFTrackName, SMFTempoIgnore, frame);
 
                        if (UIConfiguration::instance().get_only_copy_imported_files() || copy) {
-                               do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame);
+                               do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack,
+                                          SrcBest, SMFTrackName, SMFTempoIgnore, frame);
                        } else {
                                do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, frame);
                        }
@@ -445,7 +449,6 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 {
        vector<string> paths;
        GdkEvent ev;
-       framepos_t frame;
        double cy;
 
        if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
@@ -457,9 +460,8 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
                ev.button.x = x;
                ev.button.y = y;
 
-               frame = window_event_sample (&ev, 0, &cy);
-
-               snap_to (frame);
+               MusicFrame when (window_event_sample (&ev, 0, &cy), 0);
+               snap_to (when);
 
                bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
 #ifdef __APPLE__
@@ -467,9 +469,9 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
                   the main event loop with GTK/Quartz. Since import/embed wants
                   to push up a progress dialog, defer all this till we go idle.
                */
-               Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy, copy));
+               Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &Editor::idle_drop_paths), paths, when.frame, cy, copy));
 #else
-               drop_paths_part_two (paths, frame, cy, copy);
+               drop_paths_part_two (paths, when.frame, cy, copy);
 #endif
        }
 
@@ -943,6 +945,8 @@ Editor::color_handler()
 
        refresh_location_display ();
 
+       NoteBase::set_colors ();
+
        /* redraw the whole thing */
        _track_canvas->set_background_color (UIConfiguration::instance().color ("arrange base"));
        _track_canvas->queue_draw ();