From c221b09560842b71773eee15972d87c222baf6a1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Mon, 12 Oct 2009 17:46:17 +0000
Subject: Set up the ControlProtocolManager singleton in a slightly more robust
 way.

git-svn-id: svn://localhost/ardour2/branches/3.0@5768 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/control_protocol_manager.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libs/ardour/ardour')

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 359e1e8540..f315744e50 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -52,10 +52,9 @@ struct ControlProtocolInfo {
  class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
 {
   public:
-	ControlProtocolManager ();
 	~ControlProtocolManager ();
 
-	static ControlProtocolManager& instance() { return *_instance; }
+	static ControlProtocolManager& instance();
 
 	void set_session (Session&);
 	void discover_control_protocols ();
@@ -75,6 +74,7 @@ struct ControlProtocolInfo {
 	XMLNode& get_state (void);
 
   private:
+	ControlProtocolManager ();
 	static ControlProtocolManager* _instance;
 
 	Session* _session;
-- 
cgit v1.2.3