diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-17 00:28:20 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-17 00:28:20 +0000 |
commit | f5c4c8a2931f383c76212ea1cfdb6f85f43bb72f (patch) | |
tree | 7ba2fe9ac4df3bf87b222f7079b644fb5e72c078 /gtk2_ardour/sfdb_ui.cc | |
parent | a4d9d09af5853f769e1143c2353806bfb7d89f58 (diff) |
forward port 2.X changes up to and including rev 6767
git-svn-id: svn://localhost/ardour2/branches/3.0@7636 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 2e6235e70c..96380f3bff 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -423,12 +423,11 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S resetting_ourselves = false; gm = 0; - if (ARDOUR::Profile->get_sae()) { - chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops"); - chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files"); - } - #ifdef GTKOSX + chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops"); + chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops"); + chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files"); + chooser.add_shortcut_folder_uri("file:///Volumes"); #endif @@ -1079,7 +1078,7 @@ bool SoundFileOmega::bad_file_message() { MessageDialog msg (*this, - _("One or more of the selected files\ncannot be used by Ardour"), + string_compose (_("One or more of the selected files\ncannot be used by %1"), PROGRAM_NAME), true, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK); |