fix for #5224

git-svn-id: svn://localhost/ardour2/branches/3.0@13741 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 662ab44bfa0e02552393d4413b7f87abd40cebce..36a1cf008408acfcd3163a570251bc0053ca6c25 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -714,7 +714,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent)
 }
 
 void
-ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&)
+ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& a)
 {
        if (!big_clock_resize_in_progress) {
                Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));

diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index 4590183e6c9f5a4e275111027cc3ebae39de26ea..8a5d99a3753d712a28bb53588793339a0786f09a 100644 (file)
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -18,6 +18,8 @@
 
 #include "pbd/strsplit.h"
 #include "pbd/compose.h"
+#include "pbd/shortpath.h"
+
 #include "search_path_option.h"
 #include "i18n.h"
 
@@ -25,6 +27,7 @@ using namespace std;
 using namespace Gtk;
 
 SearchPathOption::SearchPathOption (const string& pathname, const string& label,
+                                   const string& default_path,
                                     sigc::slot<std::string> get, sigc::slot<bool, std::string> set)
         : Option (pathname, label)
         , _get (get)
@@ -45,7 +48,7 @@ SearchPathOption::SearchPathOption (const string& pathname, const string& label,
         vbox.pack_end (*hbox);
 
         session_label.set_use_markup (true);
-        session_label.set_markup (string_compose ("<i>%1</i>", _("the session folder")));
+        session_label.set_markup (string_compose ("<i>%1 (%2)</i>", _("the session folder"), short_path (default_path, 32)));
         session_label.set_alignment (0.0, 0.5);
         session_label.show ();
 

diff --git a/gtk2_ardour/search_path_option.h b/gtk2_ardour/search_path_option.h
index f7cf9b5dcf8602551d450acf318ab3816d1078c2..0230666656da546e806faf23a3cde2afb619c190 100644 (file)
--- a/gtk2_ardour/search_path_option.h
+++ b/gtk2_ardour/search_path_option.h
@@ -33,6 +33,7 @@ class SearchPathOption : public Option
 {
   public:
         SearchPathOption (const std::string& pathname, const std::string& label,
+                         const std::string& default_path,
                           sigc::slot<std::string>, sigc::slot<bool, std::string>);
         ~SearchPathOption ();
 

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 9470dd8a8db25a0a6179f0367d620b9dd7263d08..2b5c480503ba32e48d92950086fe3b4264405ae0 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -200,11 +200,13 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        add_option (_("Media"), new OptionEditorHeading (_("File locations")));
 
         SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
+                                                     _session->path(),
                                                       sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path),
                                                       sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path));
         add_option (_("Media"), spo);
 
         spo = new SearchPathOption ("midi-search-path", _("Search for MIDI files in:"),
+                                   _session->path(),
                                     sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_search_path),
                                     sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_search_path));