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

diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index d8c37e1367..12d7aae2d6 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <fstream>
 #include <string>
 #include <vector>
 #include <cerrno>
@@ -39,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>
@@ -50,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* [], const char** 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;
 	}
@@ -62,6 +94,8 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 
 	set_language_preference ();
 
+        setup_logging ();
+
 	char execpath[MAXPATHLEN+1];
 	uint32_t pathsz = sizeof (execpath);
 
@@ -76,18 +110,18 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 
 #ifdef ENABLE_NLS
 	if (!ARDOUR::translations_are_enabled ()) {
-		(*localedir) = "/this/cannot/exist";
+		localedir = "/this/cannot/exist";
 	} else {
 		/* force localedir into the bundle */
-		
+
 		vector<string> lpath;
 		lpath.push_back (bundle_dir);
 		lpath.push_back ("Resources");
 		lpath.push_back ("locale");
-		(*localedir) = strdup (Glib::build_filename (lpath).c_str());
+		localedir = Glib::build_filename (lpath).c_str();
 	}
 #endif
-		
+
 	export_search_path (bundle_dir, "ARDOUR_DLL_PATH", "/lib");
 
 	/* inside an OS X .app bundle, there is no difference
@@ -106,44 +140,15 @@ fixup_bundle_environment (int, char* [], const char** 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");
-
-	/* write a pango.rc file and tell pango to use it. we'd love
-	   to put this into the PROGRAM_NAME.app bundle and leave it there,
-	   but the user may not have write permission. so ...
-
-	   we also have to make sure that the user ardour directory
-	   actually exists ...
-	*/
-
-	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-		error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
-		      << endmsg;
-	} else {
-		
-		path = Glib::build_filename (userconfigdir, "pango.rc");
-		std::ofstream pangorc (path.c_str());
-		if (!pangorc) {
-			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
-		} else {
-			pangorc << "[Pango]\nModuleFiles="
-				<< Glib::build_filename (bundle_dir, "Resources/pango.modules") 
-				<< endl;
-			pangorc.close ();
-			
-			g_setenv ("PANGO_RC_FILE", path.c_str(), 1);
-		}
-	}
-	
+	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);
-	g_setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
 }
 
-void load_custom_fonts() 
+void load_custom_fonts()
 {
 	/* this code will only compile on OS X 10.6 and above, and we currently do not
 	 * need it for earlier versions since we fall back on a non-monospace,