X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fglobals.cc;h=d5579b47da27c6867e6dd8fc2286c9347a70244f;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=111b824c28053f90566af452d350c22943000b94;hpb=ea23298f10e9587eba483cb54a6f7d75ca68126a;p=ardour.git

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 111b824c28..d5579b47da 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -16,7 +16,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 #ifdef WAF_BUILD
 #include "libardour-config.h"
 #endif
@@ -68,8 +67,9 @@
 #include "ardour/control_protocol_manager.h"
 #include "ardour/debug.h"
 #include "ardour/filesystem_paths.h"
+#include "ardour/midi_region.h"
 #include "ardour/mix.h"
-#include "ardour/playlist.h"
+#include "ardour/audioplaylist.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
 #include "ardour/profile.h"
@@ -248,9 +248,11 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 	make_property_quarks ();
 	SessionObject::make_property_quarks ();
 	Region::make_property_quarks ();
+	MidiRegion::make_property_quarks ();
 	AudioRegion::make_property_quarks ();
 	RouteGroup::make_property_quarks ();
         Playlist::make_property_quarks ();
+        AudioPlaylist::make_property_quarks ();
 
 	/* this is a useful ready to use PropertyChange that many
 	   things need to check. This avoids having to compose
@@ -283,8 +285,7 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 	if (Config->load_state ()) {
 		return -1;
 	}
-
-	
+        
 	Config->set_use_vst (use_vst);
 
 	Profile = new RuntimeProfile;
@@ -328,12 +329,17 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 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;
 	if ((node = Config->control_protocol_state()) != 0) {
 		ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
 	}
+
+	MIDI::Manager::instance()->set_port_states (Config->midi_port_states ());
 }
 
 int
@@ -522,3 +528,15 @@ ARDOUR::coverage (framepos_t sa, framepos_t ea,
 	return OverlapNone;
 }
 
+string
+ARDOUR::translation_kill_path ()
+{
+        return Glib::build_filename (user_config_directory().to_string(), ".love_is_the_language_of_audio");
+}
+
+bool
+ARDOUR::translations_are_disabled ()
+{
+        /* if file does not exist, we don't translate (bundled ardour only) */
+        return Glib::file_test (translation_kill_path(), Glib::FILE_TEST_EXISTS) == false;
+}