2.X commits up to and including 7519

[ardour.git] / libs / ardour / globals.cc

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 111b824c28053f90566af452d350c22943000b94..2ecea550b5c400e02bf19738cd4260251d52b5b3 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -283,8 +283,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 +327,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 +526,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;
+}