X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fglobals.cc;h=fbce3362839c2082d2ba8c894b50916cad8d787f;hb=d90e2b42211ead2a38afd5590e2937992312795e;hp=613ecbfc7d3136eba2a177c33ed7ab0bfba0a0db;hpb=c9c94ca1c247adfc1a78fda0eda185a9a7589696;p=ardour.git

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 613ecbfc7d..fbce336283 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -21,6 +21,7 @@
 #endif
 
 #include <cstdio> // Needed so that libraptor (included in lrdf) won't complain
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -66,11 +67,11 @@
 #include "pbd/basename.h"
 
 #include "midi++/port.h"
-#include "midi++/manager.h"
 #include "midi++/mmc.h"
 
 #include "ardour/analyser.h"
 #include "ardour/audio_library.h"
+#include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
@@ -78,6 +79,7 @@
 #include "ardour/control_protocol_manager.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
 #include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
@@ -215,7 +217,7 @@ lotsa_files_please ()
 }
 
 int
-ARDOUR::init (bool use_windows_vst, bool try_optimization)
+ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir)
 {
 	if (!Glib::thread_supported()) {
 		Glib::thread_init();
@@ -224,7 +226,9 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization)
 	// this really should be in PBD::init..if there was one
 	Gio::init ();
 
-	(void) bindtextdomain(PACKAGE, LOCALEDIR);
+#ifdef ENABLE_NLS
+	(void) bindtextdomain(PACKAGE, localedir);
+#endif
 
 	PBD::ID::init ();
 	SessionEvent::init_event_pool ();
@@ -328,15 +332,14 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization)
 	EventTypeMap::instance().new_parameter(EnvelopeAutomation);
 	EventTypeMap::instance().new_parameter(MidiCCAutomation);
 
+	ARDOUR::AudioEngine::create ();
+
 	return 0;
 }
 
 void
 ARDOUR::init_post_engine ()
 {
-	/* the MIDI Manager is needed by the ControlProtocolManager */
-	MIDI::Manager::create (AudioEngine::instance()->jack());
-
 	ControlProtocolManager::instance().discover_control_protocols ();
 
 	XMLNode* node;
@@ -463,19 +466,63 @@ ARDOUR::setup_fpu ()
 #endif
 }
 
+/* this can be changed to modify the translation behaviour for
+   cases where the user has never expressed a preference.
+*/
+static const bool translate_by_default = true;
+
 string
-ARDOUR::translation_kill_path ()
+ARDOUR::translation_enable_path ()
 {
-        return Glib::build_filename (user_config_directory(), ".love_is_the_language_of_audio");
+        return Glib::build_filename (user_config_directory(), ".translate");
 }
 
 bool
-ARDOUR::translations_are_disabled ()
+ARDOUR::translations_are_enabled ()
 {
-        /* if file does not exist, we don't translate (bundled ardour only) */
-        return Glib::file_test (translation_kill_path(), Glib::FILE_TEST_EXISTS) == false;
+	int fd = ::open (ARDOUR::translation_enable_path().c_str(), O_RDONLY);
+
+	if (fd < 0) {
+		return translate_by_default;
+	}
+
+	char c;
+	bool ret = false;
+
+	if (::read (fd, &c, 1) == 1 && c == '1') {
+		ret = true;
+	}
+
+	::close (fd);
+
+	return ret;
 }
 
+bool
+ARDOUR::set_translations_enabled (bool yn)
+{
+	string i18n_enabler = ARDOUR::translation_enable_path();
+	int fd = ::open (i18n_enabler.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0644);
+
+	if (fd < 0) {
+		return false;
+	}
+	
+	char c;
+	
+	if (yn) {
+		c = '1';
+	} else {
+		c = '0';
+	}
+	
+	::write (fd, &c, 1);
+	::close (fd);
+
+	return true;
+}
+
+
 vector<SyncSource>
 ARDOUR::get_available_sync_options ()
 {