Allow port matrix to show both audio and midi ports at the same time, and use that...

[ardour.git] / gtk2_ardour / sfdb_ui.cc

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 65ae061e5c3da5b564376647be94212da200e49d..2e6235e70cefe8f3650d2292680b74fb828d0752 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -308,6 +308,11 @@ SoundFileBox::audition ()
                return;
        }
 
+       if (SMFSource::safe_midi_file_extension (path)) {
+               error << _("Auditioning of MIDI files is not yet supported") << endmsg;
+               return;
+       }
+
        _session->cancel_audition();
 
        if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
@@ -423,6 +428,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
                chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
        }
 
+#ifdef GTKOSX
+        chooser.add_shortcut_folder_uri("file:///Volumes");
+#endif
 
        //add the file chooser
        {
@@ -443,6 +451,10 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
                chooser.set_select_multiple (true);
                chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
                chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+#ifdef GTKOSX
+                /* some broken redraw behaviour - this is a bandaid */
+                chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
+#endif
 
                if (!persistent_folder.empty()) {
                        chooser.set_current_folder (persistent_folder);
@@ -1000,7 +1012,7 @@ SoundFileOmega::reset_options ()
                                channel_strings.push_back (_("sequence files"));
                        }
                        if (same_size) {
-                               channel_strings.push_back (_("all files in one region"));
+                               channel_strings.push_back (_("all files in one track"));
                        }
 
                }
@@ -1326,6 +1338,7 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
        disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
        disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
        disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
+       disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one track"), ImportMergeFiles));
 
        chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed));