#include "pbd/boost_debug.h"
#endif
-#include <jack/jack.h>
-
-#include "ardour/svn_revision.h"
+#include "ardour/revision.h"
#include "ardour/version.h"
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "i18n.h"
+#ifdef __APPLE__
+#include <Carbon/Carbon.h>
+#endif
+
using namespace std;
using namespace Gtk;
using namespace ARDOUR_COMMAND_LINE;
void
gui_jack_error ()
{
- MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
+ MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME),
false,
Gtk::MESSAGE_INFO,
Gtk::BUTTONS_NONE);
-win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
win.add_button (Stock::QUIT, RESPONSE_CLOSE);
win.set_default_response (RESPONSE_CLOSE);
vector<string> lpath;
lpath.push_back (bundle_dir);
- lpath.push_back ("share");
+ lpath.push_back ("Resources");
lpath.push_back ("locale");
localedir = strdup (Glib::build_filename (lpath).c_str());
}
export_search_path (bundle_dir, "ARDOUR_INSTANT_XML_PATH", "/Resources");
export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins");
export_search_path (bundle_dir, "VAMP_PATH", "/lib");
- export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
- export_search_path (bundle_dir, "GTK_PATH", "/lib/clearlooks");
+ export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
+
+ setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
+ setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
*/
if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
- error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
+ error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
<< endmsg;
} else {
setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
}
+static 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,
+ * non-custom font.
+ */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+ std::string ardour_mono_file;
+
+ if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+ cerr << _("Cannot find ArdourMono TrueType font") << endl;
+ }
+
+ CFStringRef ttf;
+ CFURLRef fontURL;
+ CFErrorRef error;
+ ttf = CFStringCreateWithBytes(
+ kCFAllocatorDefault, (UInt8*) ardour_mono_file.c_str(),
+ ardour_mono_file.length(),
+ kCFStringEncodingUTF8, FALSE);
+ fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
+ if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
+ cerr << _("Cannot load ArdourMono TrueType font.") << endl;
+ }
+#endif
+}
+
#else
void
export_search_path (dir_path, "ARDOUR_DATA_PATH", "/share");
export_search_path (dir_path, "LADSPA_PATH", "/plugins");
export_search_path (dir_path, "VAMP_PATH", "/lib");
- export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
+ export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
- export_search_path (dir_path, "GTK_PATH", "/lib/clearlooks");
+ setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
+ setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
/* unset GTK_RC_FILES so that we only load the RC files that we define
*/
setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
} else {
- /* use the one included in the bundle */
-
- path = Glib::build_filename (dir_path, "etc/fonts/fonts.conf");
- setenv ("FONTCONFIG_FILE", path.c_str(), 1);
- export_search_path (dir_path, "FONTCONFIG_PATH", "/etc/fonts");
+ error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
}
/* write a pango.rc file and tell pango to use it. we'd love
*/
if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
- error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
+ error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
<< endmsg;
} else {
}
-#endif
-
static void load_custom_fonts() {
std::string ardour_mono_file;
if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
}
}
+#endif
+
static gboolean
-tell_about_jack_death (void* /* ignored */)
+tell_about_backend_death (void* /* ignored */)
{
if (AudioEngine::instance()->processed_frames() == 0) {
/* died during startup */
- MessageDialog msg (_("JACK exited"), false);
+ MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
msg.set_position (Gtk::WIN_POS_CENTER);
msg.set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
+"%2 exited unexpectedly, and without notifying %1.\n\
\n\
-This could be due to misconfiguration or to an error inside JACK.\n\
+This could be due to misconfiguration or to an error inside %2.\n\
\n\
-Click OK to exit %1."), PROGRAM_NAME));
+Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
msg.run ();
_exit (0);
} else {
- /* engine has already run, so this is a mid-session JACK death */
-
- MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false));
- msg->set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
-\n\
-This is probably due to an error inside JACK. You should restart JACK\n\
-and reconnect %1 to it, or exit %1 now. You cannot save your\n\
-session at this time, because we would lose your connection information.\n"), PROGRAM_NAME));
- msg->present ();
+ /* engine has already run, so this is a mid-session backend death */
+
+ MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
+ msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
+ PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
+ msg.present ();
}
return false; /* do not call again */
}
static void
sigpipe_handler (int /*signal*/)
{
- /* XXX fix this so that we do this again after a reconnect to JACK
+ /* XXX fix this so that we do this again after a reconnect to the backend
*/
- static bool done_the_jack_thing = false;
+ static bool done_the_backend_thing = false;
- if (!done_the_jack_thing) {
+ if (!done_the_backend_thing) {
AudioEngine::instance()->died ();
- g_idle_add (tell_about_jack_death, 0);
- done_the_jack_thing = true;
+ g_idle_add (tell_about_backend_death, 0);
+ done_the_backend_thing = true;
}
}
exit (1);
}
- if (curvetest_file) {
- return curvetest (curvetest_file);
- }
-
cout << PROGRAM_NAME
<< VERSIONSTRING
<< _(" (built using ")
- << svn_revision
+ << revision
#ifdef __GNUC__
<< _(" and GCC version ") << __VERSION__
#endif
/* some GUI objects need this */
- PBD::ID::init ();
+ if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+ error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+ exit (1);
+ }
+
+ if (curvetest_file) {
+ return curvetest (curvetest_file);
+ }
if (::signal (SIGPIPE, sigpipe_handler)) {
cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
try {
ui = new ARDOUR_UI (&argc, &argv, localedir);
} catch (failed_constructor& err) {
- error << _("could not create ARDOUR GUI") << endmsg;
+ error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
exit (1);
}
ui->run (text_receiver);
Gtkmm2ext::Application::instance()->cleanup();
+ delete ui;
ui = 0;
ARDOUR::cleanup ();
projects / ardour.git / blobdiff