From e668b8c846175f90cf22b456c5e5a4cc85410da4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 17 Feb 2011 10:30:08 +0000 Subject: Jack session support for ingen. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2978 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/JackDriver.cpp | 71 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 9 deletions(-) (limited to 'src/engine/JackDriver.cpp') diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index 638217fc..d83c319f 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -15,10 +15,17 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "ingen-config.h" + #include #include #include +#ifdef INGEN_JACK_SESSION +#include +#include +#include "serialisation/Serialiser.hpp" +#endif #include "raul/log.hpp" #include "raul/List.hpp" @@ -38,7 +45,6 @@ #include "ProcessSlave.hpp" #include "QueuedEvent.hpp" #include "ThreadManager.hpp" -#include "ingen-config.h" #include "module/World.hpp" #include "shared/LV2Features.hpp" #include "shared/LV2URIMap.hpp" @@ -224,20 +230,30 @@ JackDriver::attach(const std::string& server_name, { assert(!_client); if (!jack_client) { - // Try supplied server name - if (!server_name.empty()) { + #ifdef INGEN_JACK_SESSION + const std::string uuid = _engine.world()->jack_uuid(); + if (!uuid.empty()) { _client = jack_client_open(client_name.c_str(), - JackServerName, NULL, server_name.c_str()); - if (_client) - LOG(info) << "Connected to JACK server `" << server_name << "'" << endl; + JackSessionID, NULL, + uuid.c_str()); + LOG(info) << "Connected to JACK server as client `" + << client_name.c_str() << "' UUID `" << uuid << "'" << endl; } + #endif + // Try supplied server name + if (!_client && !server_name.empty()) { + if ((_client = jack_client_open(client_name.c_str(), + JackServerName, NULL, + server_name.c_str()))) { + LOG(info) << "Connected to JACK server `" << server_name << "'" << endl; + } + } + // Either server name not specified, or supplied server name does not exist // Connect to default server if (!_client) { - _client = jack_client_open(client_name.c_str(), JackNullOption, NULL); - - if (_client) + if ((_client = jack_client_open(client_name.c_str(), JackNullOption, NULL))) LOG(info) << "Connected to default JACK server" << endl; } @@ -260,6 +276,9 @@ JackDriver::attach(const std::string& server_name, jack_set_thread_init_callback(_client, thread_init_cb, this); jack_set_sample_rate_callback(_client, sample_rate_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 (Raul::List::iterator i = _ports.begin(); i != _ports.end(); ++i) (*i)->create(); @@ -524,4 +543,38 @@ JackDriver::_block_length_cb(jack_nframes_t nframes) } +#ifdef INGEN_JACK_SESSION +void +JackDriver::_session_cb(jack_session_event_t* event) +{ + LOG(info) << "Jack session save to " << event->session_dir << endl; + + const string cmd = (boost::format("ingen -eg -n %1% -u %2% -l ${SESSION_DIR}") + % jack_get_client_name(_client) + % event->client_uuid).str(); + + SharedPtr serialiser = _engine.world()->serialiser(); + if (serialiser) { + SharedPtr root(_engine.driver()->root_patch(), NullDeleter); + serialiser->write_bundle(root, string("file://") + event->session_dir); + } + + event->command_line = strdup(cmd.c_str()); + jack_session_reply(_client, event); + + switch (event->type) { + case JackSessionSave: + break; + case JackSessionSaveAndQuit: + LOG(warn) << "Jack session quit" << endl; + _engine.quit(); + break; + case JackSessionSaveTemplate: + break; + } + + jack_session_event_free(event); +} +#endif + } // namespace Ingen -- cgit v1.2.1