ControlProtocol doesn't actually need any record of an event loop and doesn't need to connect to any signals itself

git-svn-id: svn://localhost/ardour2/branches/3.0@12063 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 21 deletions

diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index e2bc1673d8..1868957d3f 100644
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -50,22 +50,11 @@ PBD::Signal1<void,uint32_t> ControlProtocol::SetRouteSelection;
 PBD::Signal1<void,uint32_t> ControlProtocol::RemoveRouteFromSelection;
 PBD::Signal0<void>          ControlProtocol::ClearRouteSelection;
 
-ControlProtocol::ControlProtocol (Session& s, string str, EventLoop* evloop)
-	: BasicUI (s),
-	  _name (str)
+ControlProtocol::ControlProtocol (Session& s, string str)
+	: BasicUI (s)
+	, _name (str)
+	, _active (false)
 {
-	if (evloop) {
-		_own_event_loop = false;
-		_event_loop = evloop;
-	} else {
-		_own_event_loop = true;
-		fatal << "programming error: cannot create control protocols without an existing event loop (yet)" << endmsg;
-		/*NOTREACHED*/
-	}
-
-	_active = false;
-	
-	session->RouteAdded.connect (*this, MISSING_INVALIDATOR, boost::protect (boost::bind (&ControlProtocol::add_strip, this, _1)), _event_loop);
 }
 
 ControlProtocol::~ControlProtocol ()
@@ -73,12 +62,6 @@ ControlProtocol::~ControlProtocol ()
 }
 
 void
-ControlProtocol::add_strip (ARDOUR::RouteList&)
-{
-	route_list_changed();
-}
-	
-void
 ControlProtocol::next_track (uint32_t initial_id)
 {
 	uint32_t limit = session->nroutes();