X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_cocoa.cc;h=12d7aae2d680671600020e73ae4991feebd908ad;hb=a610157955af2f588f59d00ed585c2d842197c85;hp=8603db3f45c1f8d5e29d892a472476da198f0c31;hpb=2fabe64bbbaad5d142bd056943dd3d9fd080ff01;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index 8603db3f45..12d7aae2d6 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -38,7 +38,7 @@
 
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <asl.h>
 #include <Carbon/Carbon.h>
@@ -50,10 +50,16 @@ using namespace ARDOUR;
 using namespace std;
 
 extern void set_language_preference (); // cocoacarbon.mm
+extern void no_app_nap (); // cocoacarbon.mm
 
 static void
 setup_logging(void)
 {
+        /* The ASL API has evolved since it was introduced in 10.4. If ASL_LOG_DESCRIPTOR_WRITE is not available,
+           then we're not interested in doing any of this, since its only purpose is to get stderr/stdout to
+           appear in the Console.
+        */
+#ifdef ASL_LOG_DESCRIPTOR_WRITE
         aslmsg msg;
         aslclient c = asl_open (PROGRAM_NAME, "com.apple.console", 0);
 
@@ -68,11 +74,18 @@ setup_logging(void)
         asl_log(c, NULL, ASL_LEVEL_INFO, string_compose ("Hello world from %1", PROGRAM_NAME).c_str());
         asl_log_descriptor(c, msg, ASL_LEVEL_INFO, 1,  ASL_LOG_DESCRIPTOR_WRITE);
         asl_log_descriptor(c, msg, ASL_LEVEL_INFO, 2, ASL_LOG_DESCRIPTOR_WRITE);
+#else
+#warning This build host has an older ASL API, so no console logging in this build.
+#endif
 }
 
 void
 fixup_bundle_environment (int argc, char* argv[], string & localedir)
 {
+	/* do this even for non-bundle runtimes */
+
+	no_app_nap ();
+
 	if (!g_getenv ("ARDOUR_BUNDLED")) {
 		return;
 	}