Optimize automation-event process splitting

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index e3e24378c5d832836366a5759b161b76da30a8f1..77aff20c1acf273d15d72673b2603d2b818c242d 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -269,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 {
@@ -286,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;
        }
@@ -444,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
@@ -599,7 +599,7 @@ 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) {
@@ -608,7 +608,7 @@ ARDOUR::init_post_engine ()
                        /* XXX now what? */
                }
        } else {
-               if (TransportMasterManager::instance().init ()) {
+               if (TransportMasterManager::instance().set_default_configuration ()) {
                        error << _("Cannot initialize transport master manager") << endmsg;
                        /* XXX now what? */
                }