hotfix for flying percussive hits while dragging.

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index c19c14f7aa960877d3702b048f6cffce6894ef4a..bfa625ceff323b6bc68ea2e01c3e8d1513b3df63 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -22,11 +22,10 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include <fstream>
 #include <algorithm>
 #include <fcntl.h>
 
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm/filechooser.h>
@@ -47,11 +46,12 @@
 #include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/template_utils.h"
+#include "ardour/profile.h"
 
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
@@ -79,30 +79,30 @@ ArdourStartup::ArdourStartup ()
 {
        set_position (WIN_POS_CENTER);
        set_border_width (12);
-       
-       if ((icon_pixbuf = ::get_icon ("ardour_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 ("ardour_icon_16px")) != 0) {
+
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px"))) {
                window_icons.push_back (icon);
        }
-       if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+       if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
                window_icons.push_back (icon);
        }
        if (!window_icons.empty ()) {
                set_default_icon_list (window_icons);
        }
-       
+
        setup_new_user_page ();
        setup_first_time_config_page ();
        setup_monitoring_choice_page ();
@@ -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;
@@ -179,7 +167,7 @@ ArdourStartup::default_dir_changed ()
 {
        Config->set_default_session_parent_dir (default_dir_chooser->get_filename());
        // make new session folder chooser point to the new default
-       new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir());       
+       new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir());
        config_changed ();
 }
 
@@ -358,7 +346,9 @@ ArdourStartup::setup_final_page ()
 
        VBox* vbox = manage (new VBox);
        vbox->pack_start (*final_label, true, true);
-       vbox->pack_start (plugin_disco_button, true, false);
+       if (!Profile->get_mixbus()) {
+               vbox->pack_start (plugin_disco_button, true, false);
+       }
        vbox->show ();
 
        final_page_index = append_page (*vbox);
@@ -424,7 +414,7 @@ ArdourStartup::on_apply ()
                PBD::ScopedFileDescriptor fout (g_open (been_here_before_path ().c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
 
        }
-               
+
        _response = RESPONSE_OK;
        gtk_main_quit ();
 }