commits 6001-6525 inclusive from 2.X applied to 3.0

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 389bcc196c428a6fa8836588239c8862ba5fcd89..b78edc11d2e649a6bceff03a8116928804ec7cda 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -64,12 +64,14 @@
 #include "ardour/audioengine.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
+#include "ardour/buffer_manager.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/debug.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/mix.h"
 #include "ardour/playlist.h"
 #include "ardour/plugin_manager.h"
+#include "ardour/process_thread.h"
 #include "ardour/profile.h"
 #include "ardour/region.h"
 #include "ardour/rc_configuration.h"
@@ -309,7 +311,7 @@ lotsa_files_please ()
                        if (rl.rlim_cur == RLIM_INFINITY) {
                                info << _("Removed open file count limit. Excellent!") << endmsg;
                        } else {
-                               info << string_compose (_("Ardour will be limited to %1 open files"), rl.rlim_cur) << endmsg;
+                               info << string_compose (_("%1 will be limited to %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
                        }
                }
        } else {
@@ -405,6 +407,9 @@ ARDOUR::init (bool use_vst, bool try_optimization)
        /* singleton - first object is "it" */
        new PluginManager ();
 
+        ProcessThread::init ();
+        BufferManager::init (2); // XX should be num_processors_for_dsp
+
        return 0;
 }