Remove Jack session support

3 files changed, 0 insertions, 71 deletions

diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index e554c4e2..098b0418 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -45,11 +45,6 @@
 
 #include <jack/midiport.h>
 
-#ifdef INGEN_JACK_SESSION
-#include "ingen/Serialiser.hpp"
-#include <jack/session.h>
-#endif
-
 #ifdef HAVE_JACK_METADATA
 #include "jackey.h"
 #include <jack/metadata.h>
@@ -104,17 +99,6 @@ JackDriver::attach(const std::string& server_name,
 {
 	assert(!_client);
 	if (!jack_client) {
-#ifdef INGEN_JACK_SESSION
-		const std::string uuid = _engine.world().jack_uuid();
-		if (!uuid.empty()) {
-			_client = jack_client_open(client_name.c_str(),
-			                           JackSessionID, nullptr,
-			                           uuid.c_str());
-			_engine.log().info("Connected to Jack as `%1%' (UUID `%2%')\n",
-			                   client_name.c_str(), uuid);
-		}
-#endif
-
 		// Try supplied server name
 		if (!_client && !server_name.empty()) {
 			if ((_client = jack_client_open(client_name.c_str(),
@@ -153,9 +137,6 @@ JackDriver::attach(const std::string& server_name,
 
 	jack_set_thread_init_callback(_client, thread_init_cb, this);
 	jack_set_buffer_size_callback(_client, block_length_cb, this);
-#ifdef INGEN_JACK_SESSION
-	jack_set_session_callback(_client, session_cb, this);
-#endif
 
 	for (auto& p : _ports) {
 		register_port(p);
@@ -570,42 +551,5 @@ JackDriver::_block_length_cb(jack_nframes_t nframes)
 	return 0;
 }
 
-#ifdef INGEN_JACK_SESSION
-void
-JackDriver::_session_cb(jack_session_event_t* event)
-{
-	_engine.log().info("Jack session save to %1%\n", event->session_dir);
-
-	const std::string cmd = fmt("ingen -eg -n %1% -u %2% -l ${SESSION_DIR}",
-	                            jack_get_client_name(_client),
-	                            event->client_uuid);
-
-	if (auto serialiser = _engine.world().serialiser()) {
-		std::lock_guard<std::mutex> lock(_engine.world().rdf_mutex());
-
-		std::shared_ptr<Node> root(_engine.root_graph(), NullDeleter<Node>);
-		serialiser->write_bundle(root,
-		                         URI(std::string("file://") + event->session_dir));
-	}
-
-	event->command_line = static_cast<char*>(malloc(cmd.size() + 1));
-	memcpy(event->command_line, cmd.c_str(), cmd.size() + 1);
-	jack_session_reply(_client, event);
-
-	switch (event->type) {
-	case JackSessionSave:
-		break;
-	case JackSessionSaveAndQuit:
-		_engine.log().warn("Jack session quit\n");
-		_engine.quit();
-		break;
-	case JackSessionSaveTemplate:
-		break;
-	}
-
-	jack_session_event_free(event);
-}
-#endif
-
 } // namespace server
 } // namespace ingen
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index d80463be..25b666ab 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -31,9 +31,6 @@
 #include <jack/thread.h>
 #include <jack/transport.h>
 #include <jack/types.h>
-#ifdef INGEN_JACK_SESSION
-#include <jack/session.h>
-#endif
 
 #include <atomic>
 #include <cstddef>
@@ -126,11 +123,6 @@ private:
 	inline static int block_length_cb(jack_nframes_t nframes, void* const jack_driver) {
 		return static_cast<JackDriver*>(jack_driver)->_block_length_cb(nframes);
 	}
-#ifdef INGEN_JACK_SESSION
-	inline static void session_cb(jack_session_event_t* event, void* jack_driver) {
-		static_cast<JackDriver*>(jack_driver)->_session_cb(event);
-	}
-#endif
 
 	void pre_process_port(RunContext& ctx, EnginePort* port);
 	void post_process_port(RunContext& ctx, EnginePort* port) const;
@@ -143,9 +135,6 @@ private:
 	void _shutdown_cb();
 	int  _process_cb(jack_nframes_t nframes);
 	int  _block_length_cb(jack_nframes_t nframes);
-#ifdef INGEN_JACK_SESSION
-	void _session_cb(jack_session_event_t* event);
-#endif
 
 protected:
 	using Ports = boost::intrusive::slist<EnginePort,
diff --git a/wscript b/wscript
index 6a17761b..cec4c5ae 100644
--- a/wscript
+++ b/wscript
@@ -38,7 +38,6 @@ def options(ctx):
          'no-plugin': 'do not build ingen.lv2 plugin',
          'no-python': 'do not install Python bindings',
          'no-webkit': 'do not use webkit to display plugin documentation',
-         'no-jack-session': 'do not build JACK session support',
          'no-socket': 'do not build Socket interface',
          'debug-urids': 'print a trace of URI mapping',
          'portaudio': 'build PortAudio backend'})
@@ -196,8 +195,6 @@ def configure(conf):
                             return_type   = 'int',
                             arg_types     = 'jack_client_t*,jack_port_t*,const char*',
                             mandatory     = False)
-        if not Options.options.no_jack_session:
-            conf.define('INGEN_JACK_SESSION', 1)
 
     if Options.options.debug_urids:
         conf.define('INGEN_DEBUG_URIDS', 1)
@@ -251,7 +248,6 @@ def configure(conf):
          'HTML plugin doc support': bool(conf.env.HAVE_WEBKIT),
          'PortAudio driver': bool(conf.env.HAVE_PORTAUDIO),
          'Jack driver': bool(conf.env.HAVE_JACK),
-         'Jack session support': conf.is_defined('INGEN_JACK_SESSION'),
          'Jack metadata support': conf.is_defined('HAVE_JACK_METADATA'),
          'LV2 plugin driver': bool(conf.env.INGEN_BUILD_LV2),
          'LV2 bundle': conf.env.INGEN_BUNDLE_DIR,