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 33797d339ec40abf4a2ec57d970d15779ec4e509..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)) {
@@ -1333,7 +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"), ImportSerializeFiles));
+       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));