diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-16 19:07:25 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-16 19:07:25 +0200 |
| commit | 23b975e1725960c28d1a564d8bd0cac0b001afb1 (patch) | |
| tree | 6f7d903a19457661cd80483cf8cda586402ba8b2 /gtk2_ardour | |
| parent | 2c9666e0ee21666b98fced055d75400f41ec5d0b (diff) | |
use API to add system-specific volumes - #6643
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/session_dialog.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 97005e33a8..872ca9a501 100644 --- 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 915a7cae10..145451677f 100644 --- 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 c2bd388d6c..f7be171081 100644 --- 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 |