Optimize automation-event process splitting

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index ef3e95ea294505ba751091bd2b1dc051b9053bc4..77aff20c1acf273d15d72673b2603d2b818c242d 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -113,6 +113,7 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session_event.h"
 #include "ardour/source_factory.h"
+#include "ardour/transport_master_manager.h"
 #ifdef LV2_SUPPORT
 #include "ardour/uri_map.h"
 #endif
@@ -268,7 +269,7 @@ lotsa_files_please ()
                        }
                } else {
                        if (rl.rlim_cur != RLIM_INFINITY) {
-                               info << string_compose (_("Your system is configured to limit %1 to only %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
+                               info << string_compose (_("Your system is configured to limit %1 to %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
                        }
                }
        } else {
@@ -285,7 +286,7 @@ lotsa_files_please ()
         */
        int newmax = _setmaxstdio (2048);
        if (newmax > 0) {
-               info << string_compose (_("Your system is configured to limit %1 to only %2 open files"), PROGRAM_NAME, newmax) << endmsg;
+               info << string_compose (_("Your system is configured to limit %1 to %2 open files"), PROGRAM_NAME, newmax) << endmsg;
        } else {
                error << string_compose (_("Could not set system open files limit. Current limit is %1 open files"), _getmaxstdio())  << endmsg;
        }
@@ -353,7 +354,8 @@ copy_configuration_files (string const & old_dir, string const & new_dir, int ol
 
                copy_recurse (old_name, new_name);
 
-               /* presets */
+               /* plugin status */
+               g_mkdir_with_parents (Glib::build_filename (new_dir, plugin_metadata_dir_name).c_str(), 0755);
 
                old_name = Glib::build_filename (old_dir, X_("plugin_statuses")); /* until 6.0 */
                new_name = Glib::build_filename (new_dir, plugin_metadata_dir_name, X_("plugin_statuses"));
@@ -442,7 +444,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
        if (!PBD::init()) return false;
 
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);
        (void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
@@ -458,6 +460,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
         Playlist::make_property_quarks ();
         AudioPlaylist::make_property_quarks ();
         PresentationInfo::make_property_quarks ();
+        TransportMaster::make_property_quarks ();
 
        /* this is a useful ready to use PropertyChange that many
           things need to check. This avoids having to compose
@@ -594,8 +597,21 @@ void
 ARDOUR::init_post_engine ()
 {
        XMLNode* node;
+
        if ((node = Config->control_protocol_state()) != 0) {
-               ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
+               ControlProtocolManager::instance().set_state (*node, 0 /* here: global-config state */);
+       }
+
+       if ((node = Config->transport_master_state()) != 0) {
+               if (TransportMasterManager::instance().set_state (*node, Stateful::loading_state_version)) {
+                       error << _("Cannot restore transport master manager") << endmsg;
+                       /* XXX now what? */
+               }
+       } else {
+               if (TransportMasterManager::instance().set_default_configuration ()) {
+                       error << _("Cannot initialize transport master manager") << endmsg;
+                       /* XXX now what? */
+               }
        }
 
        /* find plugins */
@@ -604,7 +620,7 @@ ARDOUR::init_post_engine ()
 }
 
 void
-ARDOUR::cleanup ()
+       ARDOUR::cleanup ()
 {
        if (!libardour_initialized) {
                return;