X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_cocoa.cc;h=807f9941565846389e771b09f3becc24b23a14b1;hb=46bbe834009d51a652e03a7fd4fa57bfb6457e38;hp=1f55b10954e11478ceb522a28a4459e832bced17;hpb=76b28e7ff22a5829da275e29e26faac404a107ae;p=ardour.git diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc index 1f55b10954..807f994156 100644 --- a/gtk2_ardour/bundle_env_cocoa.cc +++ b/gtk2_ardour/bundle_env_cocoa.cc @@ -1,23 +1,22 @@ /* - Copyright (C) 2001-2012 Paul Davis + * Copyright (C) 2014-2016 Paul Davis + * Copyright (C) 2015-2018 Robin Gareus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include #include #include #include @@ -39,8 +38,9 @@ #include "bundle_env.h" -#include "i18n.h" +#include "pbd/i18n.h" +#include #include #include #include @@ -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* [], 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; } @@ -62,6 +94,8 @@ fixup_bundle_environment (int, char* [], string & localedir) set_language_preference (); + setup_logging (); + char execpath[MAXPATHLEN+1]; uint32_t pathsz = sizeof (execpath); @@ -74,20 +108,20 @@ fixup_bundle_environment (int, char* [], string & localedir) bundle_dir = Glib::path_get_dirname (exec_dir); -#ifdef ENABLE_NLS +#if ENABLE_NLS if (!ARDOUR::translations_are_enabled ()) { - (*localedir) = "/this/cannot/exist"; + localedir = "/this/cannot/exist"; } else { /* force localedir into the bundle */ - + vector 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,15 +140,15 @@ 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); } -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,