X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fglobals.cc;h=4c91956ffda0d1151f98b34e43dd27899578b5eb;hb=5e1cfcc7ed557fc28ca8b362deceefa1967ab22b;hp=5cd52b67c02d51049ee6c93ee5c8536110500394;hpb=105caf23daf5aed16c7ee8b904fcca2ddbd4f59f;p=ardour.git

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 5cd52b67c0..4c91956ffd 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>
@@ -45,18 +46,25 @@
 #include <xmmintrin.h>
 #endif
 
+#ifdef check
+#undef check /* stupid Apple and their un-namespaced, generic Carbon macros */
+#endif 
+
+#include <giomm.h>
+
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
 #include <lrdf.h>
 
+#include "pbd/cpus.h"
 #include "pbd/error.h"
 #include "pbd/id.h"
 #include "pbd/strsplit.h"
 #include "pbd/fpu.h"
 #include "pbd/file_utils.h"
 #include "pbd/enumwriter.h"
-#include "pbd/filesystem.h"
+#include "pbd/basename.h"
 
 #include "midi++/port.h"
 #include "midi++/manager.h"
@@ -106,6 +114,7 @@ mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
 mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
 
 PBD::Signal1<void,std::string> ARDOUR::BootMessage;
+PBD::Signal0<void> ARDOUR::GUIIdle;
 
 namespace ARDOUR {
 extern void setup_enum_writer ();
@@ -135,8 +144,7 @@ setup_hardware_optimization (bool try_optimization)
 			compute_peak          = x86_sse_compute_peak;
 			find_peaks            = x86_sse_find_peaks;
 			apply_gain_to_buffer  = x86_sse_apply_gain_to_buffer;
-			// mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
-			mix_buffers_with_gain = default_mix_buffers_with_gain;
+			mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
 			mix_buffers_no_gain   = x86_sse_mix_buffers_no_gain;
 
 			generic_mix_functions = false;
@@ -198,10 +206,8 @@ lotsa_files_please ()
 				error << string_compose (_("Could not set system open files limit to %1"), rl.rlim_cur) << endmsg;
 			}
 		} else {
-			if (rl.rlim_cur == RLIM_INFINITY) {
-				info << _("Removed open file count limit. Excellent!") << endmsg;
-			} else {
-				info << string_compose (_("%1 will be limited to %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
+			if (rl.rlim_cur != RLIM_INFINITY) {
+				info << string_compose (_("Your system is configured to limit %1 to only %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
 			}
 		}
 	} else {
@@ -210,13 +216,18 @@ 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();
 	}
 
-	(void) bindtextdomain(PACKAGE, LOCALEDIR);
+	// this really should be in PBD::init..if there was one
+	Gio::init ();
+
+#ifdef ENABLE_NLS
+	(void) bindtextdomain(PACKAGE, localedir);
+#endif
 
 	PBD::ID::init ();
 	SessionEvent::init_event_pool ();
@@ -294,7 +305,11 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization)
 	(void) PluginManager::instance();
 
         ProcessThread::init ();
-        BufferManager::init (10); // XX should be num_processors_for_dsp + 1 for the GUI thread
+	/* the + 4 is a bit of a handwave. i don't actually know
+	   how many more per-thread buffer sets we need above
+	   the h/w concurrency, but its definitely > 1 more.
+	*/
+        BufferManager::init (hardware_concurrency() + 4); 
 
         PannerManager::instance().discover_panners();
 
@@ -373,10 +388,10 @@ ARDOUR::find_bindings_files (map<string,string>& files)
 	}
 
 	for (vector<std::string>::iterator x = found.begin(); x != found.end(); ++x) {
-		sys::path path(*x);
+		std::string path(*x);
 		pair<string,string> namepath;
-		namepath.second = path.to_string();
-		namepath.first = path.leaf().substr (0, path.leaf().find_first_of ('.'));
+		namepath.second = path;
+		namepath.first = PBD::basename_nosuffix (path);
 		files.insert (namepath);
 	}
 }
@@ -451,15 +466,72 @@ 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 ()
+{
+	vector<SyncSource> ret;
+
+	ret.push_back (JACK);
+	ret.push_back (MTC);
+	ret.push_back (MIDIClock);
+	ret.push_back (LTC);
+
+	return ret;
 }