The return of the Mixbus Send-options (allow aux-feedback override)

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

diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc
index 049e11f1c310b1e7b4825e6f3ec5e7ad8c28f067..ab0f668f26d93406dc6632fc370b01e88851e22c 100644 (file)
--- a/libs/pbd/pbd.cc
+++ b/libs/pbd/pbd.cc
@@ -42,7 +42,7 @@
 #include "pbd/windows_mmcss.h"
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 extern void setup_libpbd_enums ();
 
@@ -50,8 +50,7 @@ namespace {
 
 static bool libpbd_initialized = false;
 
-}
-
+static
 void
 set_debug_options_from_env ()
 {
@@ -66,6 +65,7 @@ set_debug_options_from_env ()
 }
 
 #ifdef PLATFORM_WINDOWS
+static
 void
 test_timers_from_env ()
 {
@@ -83,6 +83,8 @@ test_timers_from_env ()
 }
 #endif
 
+} // namespace
+
 bool
 PBD::init ()
 {
@@ -99,7 +101,7 @@ PBD::init ()
 
        /* Initialize windows socket DLL for PBD::CrossThreadChannel
         */
-       
+
        if (WSAStartup(MAKEWORD(1,1),&wsaData) != 0) {
                fatal << X_("Windows socket initialization failed with error: ") << WSAGetLastError() << endmsg;
                abort();
@@ -107,6 +109,7 @@ PBD::init ()
                return false;
        }
 
+       QPC::initialize();
        test_timers_from_env ();
 
        if (!PBD::MMCSS::initialize()) {
@@ -138,7 +141,7 @@ PBD::cleanup ()
 #ifdef PLATFORM_WINDOWS
        PBD::MMCSS::deinitialize ();
        WSACleanup();
-#endif 
+#endif
 
        EnumWriter::destroy ();
        FPU::destroy ();