rename TransportMasterManager::init() to ::set_default_configuration() to make its...

diff --git a/libs/ardour/ardour/transport_master_manager.h b/libs/ardour/ardour/transport_master_manager.h
index 5ed3855eb2200ceafb50d44b7f2452ac6ac43c56..ac61a97a9f36eba34a2214282008b95c5a5acffb 100644 (file)
--- a/libs/ardour/ardour/transport_master_manager.h
+++ b/libs/ardour/ardour/transport_master_manager.h
@@ -35,9 +35,13 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable
   public:
        ~TransportMasterManager ();
 
-       int init ();
+       int set_default_configuration ();
 
        static TransportMasterManager& instance();
+       /* this method is not thread-safe and is intended to be used only
+        * very early in application-lifetime to check if the TMM has
+        * been created yet. Do not use in other code.
+        */
        static bool exists() { return _instance != 0; }
 
        typedef std::list<boost::shared_ptr<TransportMaster> > TransportMasters;

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index eab0b93a41345d57024997126cbd748c7111beb1..eca6d44de2e6bf0ad4681c34b4182a1e31deafed 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -608,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? */
                }

diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc
index 6354dff05ce3c53d7a207c11218cc7e9ce64f7cd..fafbf6042bf255daa11662ea0a6288126c7a7aa6 100644 (file)
--- a/libs/ardour/transport_master_manager.cc
+++ b/libs/ardour/transport_master_manager.cc
@@ -51,7 +51,7 @@ TransportMasterManager::~TransportMasterManager ()
 }
 
 int
-TransportMasterManager::init ()
+TransportMasterManager::set_default_configuration ()
 {
        try {
                /* setup default transport masters. Most people will never need any