Prepare export-format codec-quality setting

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index a806b693b4a072c153a80ba55cc80b866d4dd314..eca6d44de2e6bf0ad4681c34b4182a1e31deafed 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -444,7 +444,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
        if (!PBD::init()) return false;
 
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);
        (void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
@@ -460,6 +460,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
         Playlist::make_property_quarks ();
         AudioPlaylist::make_property_quarks ();
         PresentationInfo::make_property_quarks ();
+        TransportMaster::make_property_quarks ();
 
        /* this is a useful ready to use PropertyChange that many
           things need to check. This avoids having to compose
@@ -598,7 +599,7 @@ ARDOUR::init_post_engine ()
        XMLNode* node;
 
        if ((node = Config->control_protocol_state()) != 0) {
-               ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
+               ControlProtocolManager::instance().set_state (*node, 0 /* here: global-config state */);
        }
 
        if ((node = Config->transport_master_state()) != 0) {
@@ -607,7 +608,7 @@ ARDOUR::init_post_engine ()
                        /* XXX now what? */
                }
        } else {
-               if (TransportMasterManager::instance().init ()) {
+               if (TransportMasterManager::instance().set_default_configuration ()) {
                        error << _("Cannot initialize transport master manager") << endmsg;
                        /* XXX now what? */
                }