a reverb is a reverb is a reverb

[ardour.git] / gtk2_ardour / bundle_env_cocoa.cc

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index cd939ea0aa82b385f1cf0a326dddbc1bb146fb32..12d7aae2d680671600020e73ae4991feebd908ad 100644 (file)
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -38,8 +38,9 @@
 
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
+#include <asl.h>
 #include <Carbon/Carbon.h>
 #include <mach-o/dyld.h>
 #include <sys/param.h>
@@ -49,10 +50,42 @@ 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);
+
+        msg = asl_new(ASL_TYPE_MSG);
+        asl_set(msg, ASL_KEY_FACILITY, "com.apple.console");
+        asl_set(msg, ASL_KEY_LEVEL, ASL_STRING_NOTICE);
+        asl_set(msg, ASL_KEY_READ_UID, "-1");
+
+        int fd = dup(2);
+        //asl_set_filter(c, ASL_FILTER_MASK_UPTO(ASL_LEVEL_DEBUG));
+        asl_add_log_file(c, fd);
+        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, char* [], string & localedir)
+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;
        }
@@ -61,6 +94,8 @@ fixup_bundle_environment (int, char* [], string & localedir)
 
        set_language_preference ();
 
+        setup_logging ();
+
        char execpath[MAXPATHLEN+1];
        uint32_t pathsz = sizeof (execpath);
 
@@ -105,10 +140,10 @@ fixup_bundle_environment (int, char* [], string & localedir)
        g_setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
        g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(g_getenv ("PATH"))).c_str(), 1);
 
-       /* unset GTK_RC_FILES so that we only load the RC files that we define
+       /* unset GTK2_RC_FILES so that we only load the RC files that we define
         */
 
-       g_unsetenv ("GTK_RC_FILES");
+       g_unsetenv ("GTK2_RC_FILES");
        g_setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
        g_setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
 }