Unify build-system customization (Ardour/Mixbus)

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 12f98916bf30188048617390943b32bebd83cf7f..e23016f8260d47588b94ec79d9229033c77c8327 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -48,6 +48,8 @@
 #include "ardour/template_utils.h"
 #include "ardour/profile.h"
 
+#include "gtkmm2ext/utils.h"
+
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
@@ -119,20 +121,8 @@ ArdourStartup::~ArdourStartup ()
 bool
 ArdourStartup::required ()
 {
-       /* look for a "been here before" file for this version or earlier
-        * versions
-        */
-
-       const int current_version = atoi (PROGRAM_VERSION);
-
-       for (int v = current_version; v != 0; --v) {
-               if (Glib::file_test (ARDOUR::been_here_before_path (v), Glib::FILE_TEST_EXISTS)) {
-                       if (v != current_version) {
-                               /* older version exists, create the current one */
-                               PBD::ScopedFileDescriptor fout (g_open (been_here_before_path (current_version).c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
-                       }
-                       return false;
-               }
+       if (Glib::file_test (ARDOUR::been_here_before_path (), Glib::FILE_TEST_EXISTS)) {
+               return false;
        }
 
        return true;
@@ -214,6 +204,7 @@ Where would you like new %1 sessions to be stored by default?\n\n\
        vbox->pack_start (*hbox, false, true);
 
        cerr << "set default folder to " << poor_mans_glob (Config->get_default_session_parent_dir()) << endl;
+       Gtkmm2ext::add_volume_shortcuts (*default_dir_chooser);
        default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
        default_dir_chooser->signal_current_folder_changed().connect (sigc::mem_fun (*this, &ArdourStartup::default_dir_changed));
        default_dir_chooser->show ();
@@ -266,6 +257,9 @@ Please choose whichever one is right for your setup.\n\n\
        set_page_title (mon_vbox, _("Monitoring Choices"));
        set_page_header_image (mon_vbox, icon_pixbuf);
 
+       monitor_via_hardware_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed));
+       monitor_via_ardour_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed));
+
        /* user could just click on "Forward" if default
         * choice is correct.
         */