remove artificial, accidental and utterly unintended limit of the numbering of scene...

[ardour.git] / libs / ardour / globals.cc

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index f097ce84f57c95c8fc7745906905125e104fe679..fa6f833d94eb29fe64980321e4f4a7228efdf9db 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -131,6 +131,7 @@ find_peaks_t            ARDOUR::find_peaks = 0;
 apply_gain_to_buffer_t  ARDOUR::apply_gain_to_buffer = 0;
 mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
 mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
+copy_vector_t                  ARDOUR::copy_vector = 0;
 
 PBD::Signal1<void,std::string> ARDOUR::BootMessage;
 PBD::Signal3<void,std::string,std::string,bool> ARDOUR::PluginScanMessage;
@@ -138,6 +139,8 @@ PBD::Signal1<void,int> ARDOUR::PluginScanTimeout;
 PBD::Signal0<void> ARDOUR::GUIIdle;
 PBD::Signal3<bool,std::string,std::string,int> ARDOUR::CopyConfigurationFiles;
 
+static bool have_old_configuration_files = false;
+
 namespace ARDOUR {
 extern void setup_enum_writer ();
 }
@@ -158,7 +161,21 @@ setup_hardware_optimization (bool try_optimization)
 
 #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
 
-               if (fpu.has_sse()) {
+               if (fpu.has_avx()) {
+
+                       info << "Using AVX optimized routines" << endmsg;
+
+                       // AVX SET
+                       compute_peak          = x86_sse_avx_compute_peak;
+                       find_peaks            = x86_sse_avx_find_peaks;
+                       apply_gain_to_buffer  = x86_sse_avx_apply_gain_to_buffer;
+                       mix_buffers_with_gain = x86_sse_avx_mix_buffers_with_gain;
+                       mix_buffers_no_gain   = x86_sse_avx_mix_buffers_no_gain;
+                       copy_vector           = x86_sse_avx_copy_vector;
+
+                       generic_mix_functions = false;
+
+               } else if (fpu.has_sse()) {
 
                        info << "Using SSE optimized routines" << endmsg;
 
@@ -168,6 +185,7 @@ setup_hardware_optimization (bool try_optimization)
                        apply_gain_to_buffer  = x86_sse_apply_gain_to_buffer;
                        mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
                        mix_buffers_no_gain   = x86_sse_mix_buffers_no_gain;
+                       copy_vector           = default_copy_vector;
 
                        generic_mix_functions = false;
 
@@ -185,6 +203,7 @@ setup_hardware_optimization (bool try_optimization)
                        apply_gain_to_buffer   = veclib_apply_gain_to_buffer;
                        mix_buffers_with_gain  = veclib_mix_buffers_with_gain;
                        mix_buffers_no_gain    = veclib_mix_buffers_no_gain;
+                       copy_vector            = default_copy_vector;
 
                        generic_mix_functions = false;
 
@@ -204,6 +223,7 @@ setup_hardware_optimization (bool try_optimization)
                apply_gain_to_buffer  = default_apply_gain_to_buffer;
                mix_buffers_with_gain = default_mix_buffers_with_gain;
                mix_buffers_no_gain   = default_mix_buffers_no_gain;
+               copy_vector           = default_copy_vector;
 
                info << "No H/W specific optimizations in use" << endmsg;
        }
@@ -263,9 +283,25 @@ copy_configuration_files (string const & old_dir, string const & new_dir, int ol
 
                copy_file (old_name, new_name);
 
-               /* can only copy ardour.rc - UI config is not compatible */
+               old_name = Glib::build_filename (old_dir, X_("sfdb"));
+               new_name = Glib::build_filename (new_dir, X_("sfdb"));
+
+               copy_file (old_name, new_name);
+
+               /* can only copy ardour.rc/config - UI config is not compatible */
+
+               /* users who have been using git/nightlies since the last
+                * release of 3.5 will have $CONFIG/config rather than
+                * $CONFIG/ardour.rc. Pick up the newer "old" config file,
+                * to avoid confusion.
+                */
+               
+               string old_name = Glib::build_filename (old_dir, X_("config"));
+
+               if (!Glib::file_test (old_name, Glib::FILE_TEST_EXISTS)) {
+                       old_name = Glib::build_filename (old_dir, X_("ardour.rc"));
+               }
 
-               old_name = Glib::build_filename (old_dir, X_("ardour.rc"));
                new_name = Glib::build_filename (new_dir, X_("config"));
 
                copy_file (old_name, new_name);
@@ -314,31 +350,43 @@ copy_configuration_files (string const & old_dir, string const & new_dir, int ol
        return 0;
 }
 
-int
-ARDOUR::check_for_old_configuration_files (boost::function<bool (std::string const&, std::string const&, int)> ui_handler)
+void
+ARDOUR::check_for_old_configuration_files ()
 {
        int current_version = atoi (X_(PROGRAM_VERSION));
        
        if (current_version <= 1) {
-               return 0;
+               return;
        }
 
        int old_version = current_version - 1;
 
        string old_config_dir = user_config_directory (old_version);
        /* pass in the current version explicitly to avoid creation */
-       string current_config_dir = user_config_directory (current_version); 
+       string current_config_dir = user_config_directory (current_version);
 
        if (!Glib::file_test (current_config_dir, Glib::FILE_TEST_IS_DIR)) {
                if (Glib::file_test (old_config_dir, Glib::FILE_TEST_IS_DIR)) {
-                       
-                       if (ui_handler (old_config_dir, current_config_dir, old_version)) {
-                               copy_configuration_files (old_config_dir, current_config_dir, old_version);
-                               return 1;
-                       }
+                       have_old_configuration_files = true;
                }
        }
+}
 
+int
+ARDOUR::handle_old_configuration_files (boost::function<bool (std::string const&, std::string const&, int)> ui_handler)
+{
+       if (have_old_configuration_files) {
+               int current_version = atoi (X_(PROGRAM_VERSION));
+               assert (current_version > 1); // established in check_for_old_configuration_files ()
+               int old_version = current_version - 1;
+               string old_config_dir = user_config_directory (old_version);
+               string current_config_dir = user_config_directory (current_version);
+
+               if (ui_handler (old_config_dir, current_config_dir, old_version)) {
+                       copy_configuration_files (old_config_dir, current_config_dir, old_version);
+                       return 1;
+               }
+       }
        return 0;
 }