use API to add system-specific volumes - #6643

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 97005e33a815423b57db7cd78a39ba18b3980e85..872ca9a5016217ba01364aabd5b83f65967da9a5 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1700,11 +1700,9 @@ ARDOUR_UI::open_session ()
                open_session_selector.set_current_folder(Config->get_default_session_parent_dir());
        }
 
+       Gtkmm2ext::add_volume_shortcuts (open_session_selector);
        try {
                /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
-#ifdef GTKOSX
-               open_session_selector.add_shortcut_folder_uri("file:///Volumes");
-#endif
                string default_session_folder = Config->get_default_session_parent_dir();
                open_session_selector.add_shortcut_folder (default_session_folder);
        }

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 915a7cae1043467d56e35dffe6c61fac0238556e..145451677fa2b35fdf16afa693c30b7ee5339d04 100644 (file)
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -397,9 +397,7 @@ SessionDialog::setup_initial_choice_box ()
        existing_session_chooser.add_filter (session_filter);
        existing_session_chooser.set_filter (session_filter);
 
-#ifdef GTKOSX
-       existing_session_chooser.add_shortcut_folder ("/Volumes");
-#endif
+       Gtkmm2ext::add_volume_shortcuts (existing_session_chooser);
 
        Label* browse_label = manage (new Label);
        browse_label->set_markup (string_compose ("<span weight=\"bold\" size=\"large\">%1</span>", _("Other Sessions")));
@@ -540,9 +538,7 @@ SessionDialog::setup_new_session_page ()
        new_folder_chooser.show ();
        new_folder_chooser.set_title (_("Select folder for session"));
 
-#ifdef __APPLE__
-       new_folder_chooser.add_shortcut_folder ("/Volumes");
-#endif
+       Gtkmm2ext::add_volume_shortcuts (new_folder_chooser);
 
        vbox1->pack_start (*hbox2, false, false);
 

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index c2bd388d6cb5f83014cb445916473c2214650bc7..f7be171081d9fcb084a35e36fe050e6003ae2f80 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -566,12 +566,12 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
                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");
        }
        catch (Glib::Error & e) {
                std::cerr << "sfdb.add_shortcut_folder() threw Glib::Error " << e.what() << std::endl;
        }
 #endif
+       Gtkmm2ext::add_volume_shortcuts (chooser);
 
        //add the file chooser