Skip silent sources on session-archive -- fixes #7699

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index ed0cd885cb4a3f0edadf809464e681edb7db088e..b481e434d14de5438438fed8c3b7f94bdd299aa2 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -51,7 +51,7 @@
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
@@ -80,23 +80,23 @@ ArdourStartup::ArdourStartup ()
        set_position (WIN_POS_CENTER);
        set_border_width (12);
 
-       if ((icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px")) == 0) {
+       if (! (icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
                throw failed_constructor();
        }
 
        list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
        Glib::RefPtr<Gdk::Pixbuf> icon;
 
-       if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
                window_icons.push_back (icon);
        }
        if (!window_icons.empty ()) {
@@ -119,20 +119,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;
@@ -266,6 +254,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.
         */