X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=abbf216eea9f06f95c86c38ad6d9a91c72b5e423;hb=68e943265edf04e63a8e8b8f62bab20f99d9c637;hp=41a279f604983dca909ed36e60b37d509f9107f7;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 41a279f604..abbf216eea 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -32,13 +33,16 @@ #include #include #include +#include +#include #include #include #include -#include "svn_revision.h" +#include "../svn_revision.h" #include "version.h" +#include "utils.h" #include "ardour_ui.h" #include "opts.h" #include "enums.h" @@ -46,7 +50,7 @@ #include "i18n.h" using namespace Gtk; -using namespace GTK_ARDOUR; +using namespace ARDOUR_COMMAND_LINE; using namespace ARDOUR; using namespace PBD; using namespace sigc; @@ -56,39 +60,7 @@ TextReceiver text_receiver ("ardour"); extern int curvetest (string); static ARDOUR_UI *ui = 0; - -string -which_ui_rcfile () -{ - string rcfile; - char* env; - - if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) { - rcfile = env; - } else { - rcfile = "ardour2_ui.rc"; - } - - rcfile = find_config_file (rcfile); - - if (rcfile.empty()) { - warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg; - } else { - cerr << "Loading ui configuration file " << rcfile << endl; - } - - return rcfile; -} - -gint -show_ui_callback (void *arg) -{ - ARDOUR_UI * ui = (ARDOUR_UI *) arg; - - ui->hide_splash(); - - return FALSE; -} +static const char* localedir = LOCALEDIR; void gui_jack_error () @@ -120,65 +92,179 @@ Please consider the possibilities, and perhaps (re)start JACK.")); win.run (); } -static bool -maybe_load_session () + +#ifdef __APPLE__ + +#include +#include +#include + +void +fixup_bundle_environment () { - /* If no session name is given: we're not loading a session yet, nor creating a new one */ - if (!session_name.length()) { - ui->hide_splash (); - if (!Config->get_no_new_session_dialog()) { - if (!ui->new_session ()) { - return false; - } - } + if (!getenv ("ARDOUR_BUNDLED")) { + return; + } + + char execpath[MAXPATHLEN+1]; + uint32_t pathsz = sizeof (execpath); + + _NSGetExecutablePath (execpath, &pathsz); + + Glib::ustring exec_path (execpath); + Glib::ustring dir_path = Glib::path_get_dirname (exec_path); + Glib::ustring path; + const char *cstr = getenv ("PATH"); - return true; + /* ensure that we find any bundled executables (e.g. JACK) */ + + path = dir_path; + if (cstr) { + path += ':'; + path += cstr; + } + setenv ("PATH", path.c_str(), 1); + + path = dir_path; + path += "/../Resources"; + path += dir_path; + path += "/../Resources/Surfaces"; + path += dir_path; + path += "/../Resources/Panners"; + + setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1); + + path = dir_path; + path += "/../Resources/icons:"; + path += dir_path; + path += "/../Resources/pixmaps:"; + path += dir_path; + path += "/../Resources/share:"; + path += dir_path; + path += "/../Resources"; + + setenv ("ARDOUR_PATH", path.c_str(), 1); + setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); + setenv ("ARDOUR_DATA_PATH", path.c_str(), 1); + + cstr = getenv ("LADSPA_PATH"); + if (cstr) { + path = cstr; + path += ':'; } + path = dir_path; + path += "/../Plugins"; + + setenv ("LADSPA_PATH", path.c_str(), 1); - /* Load session or start the new session dialog */ - string name, path; + cstr = getenv ("VAMP_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } + path = dir_path; + path += "/../Frameworks"; + + setenv ("VAMP_PATH", path.c_str(), 1); - bool isnew; + cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH"); + if (cstr) { + path = cstr; + path += ':'; + } + path = dir_path; + path += "/../Surfaces"; + + setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1); - if (Session::find_session (session_name, path, name, isnew)) { - error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg; - return false; + cstr = getenv ("LV2_PATH"); + if (cstr) { + path = cstr; + path += ':'; } + path = dir_path; + path += "/../Plugins"; + + setenv ("LV2_PATH", path.c_str(), 1); - if (!new_session) { - - /* Loading a session, but the session doesn't exist */ - if (isnew) { - error << string_compose (_("\n\nNo session named \"%1\" exists.\n" - "To create it from the command line, start ardour as \"ardour --new %1"), path) - << endmsg; - return false; - } - - if (ui->load_session (path, name)) { - /* it failed */ - return false; - } + path = dir_path; + path += "/../Frameworks/clearlooks"; + + setenv ("GTK_PATH", path.c_str(), 1); + + path = dir_path; + path += "/../Resources/locale"; + + localedir = strdup (path.c_str()); + + /* write a pango.rc file and tell pango to use it. we'd love + to put this into the Ardour.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 ... + */ + try { + sys::create_directories (user_config_directory ()); + } + catch (const sys::filesystem_error& ex) { + error << _("Could not create user configuration directory") << endmsg; + } + + sys::path pangopath = user_config_directory(); + pangopath /= "pango.rc"; + path = pangopath.to_string(); + + std::ofstream pangorc (path.c_str()); + if (!pangorc) { + error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg; + return; } else { + pangorc << "[Pango]\nModuleFiles="; - /* TODO: This bit of code doesn't work properly yet - Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path)); - ui->set_will_create_new_session_automatically (true); - */ - - /* Show the NSD */ - ui->hide_splash (); - if (!Config->get_no_new_session_dialog()) { - if (!ui->new_session ()) { - return false; - } - } + pangopath = dir_path; + pangopath /= ".."; + pangopath /= "Resources"; + pangopath /= "pango.modules"; + + pangorc << pangopath.to_string() << endl; + + pangorc.close (); + + setenv ("PANGO_RC_FILE", path.c_str(), 1); } - return true; + // gettext charset aliases + + setenv ("CHARSETALIASDIR", path.c_str(), 1); + + // font config + + path = dir_path; + path += "/../Resources/fonts.conf"; + + setenv ("FONTCONFIG_FILE", path.c_str(), 1); + + // GDK Pixbuf loader module file + + path = dir_path; + path += "/../Resources/gdk-pixbuf.loaders"; + + setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1); + + if (getenv ("ARDOUR_WITH_JACK")) { + // JACK driver dir + + path = dir_path; + path += "/../Frameworks"; + + setenv ("JACK_DRIVER_DIR", path.c_str(), 1); + } } +#endif + #ifdef VST_SUPPORT /* this is called from the entry point of a wine-compiled executable that is linked against gtk2_ardour built @@ -189,15 +275,17 @@ int ardour_main (int argc, char *argv[]) #else int main (int argc, char *argv[]) #endif - { - ARDOUR::AudioEngine *engine; vector null_file_list; + +#ifdef __APPLE__ + fixup_bundle_environment (); +#endif Glib::thread_init(); gtk_set_locale (); - (void) bindtextdomain (PACKAGE, LOCALEDIR); + (void) bindtextdomain (PACKAGE, localedir); /* our i18n translations are all in UTF-8, so make sure that even if the user locale doesn't specify UTF-8, we use that when handling them. @@ -237,7 +325,7 @@ int main (int argc, char *argv[]) } if (no_splash) { - cerr << _("Copyright (C) 1999-2007 Paul Davis") << endl + cerr << _("Copyright (C) 1999-2008 Paul Davis") << endl << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl << endl << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl @@ -252,61 +340,17 @@ int main (int argc, char *argv[]) PBD::ID::init (); try { - ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile()); + ui = new ARDOUR_UI (&argc, &argv); } catch (failed_constructor& err) { error << _("could not create ARDOUR GUI") << endmsg; exit (1); } - if (!keybindings_path.empty()) { - ui->set_keybindings_path (keybindings_path); - } - - if (!no_splash) { - ui->show_splash (); - if (session_name.length()) { - g_timeout_add (4000, show_ui_callback, ui); - } - } - - try { - ARDOUR::init (*engine, use_vst, try_hw_optimization); - setup_gtk_ardour_enums (); - Config->set_current_owner (ConfigVariableBase::Interface); - - try { - engine = new ARDOUR::AudioEngine (jack_client_name); - } catch (AudioEngine::NoBackendAvailable& err) { - gui_jack_error (); - error << string_compose (_("Could not connect to JACK server as \"%1\""), jack_client_name) << endmsg; - return -1; - } - - ui->set_engine (*engine); - - } catch (failed_constructor& err) { - error << _("could not initialize Ardour.") << endmsg; - return -1; - } - - ui->start_engine (); - - if (maybe_load_session ()) { - ui->run (text_receiver); - ui = 0; - } + ui->run (text_receiver); + ui = 0; - delete engine; ARDOUR::cleanup (); - - if (ui) { - ui->kill(); - } - pthread_cancel_all (); - - exit (0); - return 0; } #ifdef VST_SUPPORT