From 936441d0c850a3b5e8550cb572c4d759589de923 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 15 Aug 2012 18:07:41 +0000
Subject: Remove unnecessary Jack thread bookkeeping stuff.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4703 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/JackDriver.cpp |  5 -----
 src/server/JackDriver.hpp | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 31f19032..83a86a54 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -176,8 +176,6 @@ JackDriver::deactivate()
 			_client = NULL;
 		}
 
-		_jack_threads.clear();
-
 		LOG(Raul::info)("Deactivated Jack client\n");
 	}
 }
@@ -377,10 +375,8 @@ JackDriver::_process_cb(jack_nframes_t nframes)
 void
 JackDriver::_thread_init_cb()
 {
-	Raul::Thread* thread = &Raul::Thread::get("Jack");
 	ThreadManager::set_flag(THREAD_PROCESS);
 	ThreadManager::set_flag(THREAD_IS_REAL_TIME);
-	_jack_threads.push_back(SharedPtr<Raul::Thread>(thread));
 }
 
 void
@@ -388,7 +384,6 @@ JackDriver::_shutdown_cb()
 {
 	LOG(Raul::info)("Jack shutdown, exiting\n");
 	_is_activated = false;
-	_jack_threads.clear();
 	_client = NULL;
 }
 
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index 93f24ece..c9bda939 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -19,7 +19,6 @@
 
 #include "ingen_config.h"
 
-#include <list>
 #include <string>
 
 #include <jack/jack.h>
@@ -30,7 +29,6 @@
 
 #include "raul/AtomicInt.hpp"
 #include "raul/Semaphore.hpp"
-#include "raul/Thread.hpp"
 
 #include "Driver.hpp"
 #include "EnginePort.hpp"
@@ -130,18 +128,17 @@ private:
 protected:
 	typedef boost::intrusive::list<EnginePort> Ports;
 
-	Engine&                              _engine;
-	Ports                                _ports;
-	std::list< SharedPtr<Raul::Thread> > _jack_threads;
-	Raul::Semaphore                      _sem;
-	Raul::AtomicInt                      _flag;
-	jack_client_t*                       _client;
-	jack_nframes_t                       _block_length;
-	jack_nframes_t                       _sample_rate;
-	uint32_t                             _midi_event_type;
-	bool                                 _is_activated;
-	jack_position_t                      _position;
-	jack_transport_state_t               _transport_state;
+	Engine&                _engine;
+	Ports                  _ports;
+	Raul::Semaphore        _sem;
+	Raul::AtomicInt        _flag;
+	jack_client_t*         _client;
+	jack_nframes_t         _block_length;
+	jack_nframes_t         _sample_rate;
+	uint32_t               _midi_event_type;
+	bool                   _is_activated;
+	jack_position_t        _position;
+	jack_transport_state_t _transport_state;
 };
 
 } // namespace Server
-- 
cgit v1.2.1