LADI
/
jack2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add support for internal session files" 

This reverts commit 2ad48419a7.

libjackserver.so is not a half-baked session manager anymore
This commit is contained in:
Nedko Arnaudov 2023-08-27 20:16:59 +03:00
parent 7a1807c380
commit 77a91edb60
7 changed files with 0 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/JackControlAPI.cpp
View File

@ -1483,17 +1483,6 @@ SERVER_EXPORT bool jackctl_server_unload_internal(
}
}
SERVER_EXPORT bool jackctl_server_load_session_file(
jackctl_server * server_ptr,
const char * file)
{
if (!server_ptr || !file || !server_ptr->engine) {
return false;
}
return (server_ptr->engine->LoadInternalSessionFile(file) >= 0);
}
SERVER_EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
{
if (server_ptr && server_ptr->engine) {

4
common/JackControlAPI.h
View File

@ -287,10 +287,6 @@ SERVER_EXPORT bool jackctl_server_unload_internal(
jackctl_server * server,
jackctl_internal * internal);
SERVER_EXPORT bool jackctl_server_load_session_file(
jackctl_server * server_ptr,
const char * file);
SERVER_EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
jackctl_driver_t * driver);

176
common/JackInternalSessionLoader.cpp
View File

@ -1,176 +0,0 @@
/*
Copyright (C) 2017 Timo Wischer
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <fstream>
#include "JackInternalSessionLoader.h"
#include "JackLockedEngine.h"
namespace Jack
{
JackInternalSessionLoader::JackInternalSessionLoader(JackServer* const server) :
fServer(server)
{
}
int JackInternalSessionLoader::Load(const char* file)
{
std::ifstream infile(file);
if (!infile.is_open()) {
jack_error("JACK internal session file %s does not exist or cannot be opened for reading.", file);
return -1;
}
std::string line;
int linenr = -1;
while (std::getline(infile, line))
{
linenr++;
std::istringstream iss(line);
std::string command;
if ( !(iss >> command) ) {
/* ignoring empty line or line only filled with spaces */
continue;
}
/* convert command to lower case to accept any case of the letters in the command */
std::transform(command.begin(), command.end(), command.begin(), ::tolower);
if ( (command.compare("c") == 0) || (command.compare("con") == 0) ) {
ConnectPorts(iss, linenr);
} else if ( (command.compare("l") == 0) || (command.compare("load") == 0) ) {
LoadClient(iss, linenr);
#if 0
/* NOTE: c++11 only */
} else if (command.front() == '#') {
#else
} else if (command[0] == '#') {
#endif
/* ignoring commented lines.
* The # can be followed by non spaces.
* Therefore only compare the first letter of the command.
*/
} else {
jack_error("JACK internal session file %s line %u contains unknown command '%s'. Ignoring the line!", file, linenr, line.c_str());
}
}
return 0;
}
void JackInternalSessionLoader::LoadClient(std::istringstream& iss, const int linenr)
{
std::string client_name;
if ( !(iss >> client_name) ) {
jack_error("Cannot read client name from internal session file line %u '%s'. Ignoring the line!", linenr, iss.str().c_str());
return;
}
std::string lib_name;
if ( !(iss >> lib_name) ) {
jack_error("Cannot read client library name from internal session file line %u '%s'. Ignoring the line!", linenr, iss.str().c_str());
return;
}
/* get the rest of the line */
std::string parameters;
if ( std::getline(iss, parameters) ) {
/* remove the leading spaces */
const std::size_t start = parameters.find_first_not_of(" \t");
if (start == std::string::npos) {
/* Parameters containing only spaces.
* Use empty parameter string.
*/
parameters = "";
} else {
parameters = parameters.substr(start);
}
}
/* jackctl_server_load_internal() can not be used
* because it calls jack_internal_initialize()
* instead of jack_initialize()
*/
int status = 0;
int refnum = 0;
if (fServer->InternalClientLoad1(client_name.c_str(), lib_name.c_str(), parameters.c_str(), (JackLoadName|JackUseExactName|JackLoadInit), &refnum, -1, &status) < 0) {
/* Due to the JackUseExactName option JackNameNotUnique will always handled as a failure.
* See JackEngine::ClientCheck().
*/
if (status & JackNameNotUnique) {
jack_error("Internal client name `%s' not unique", client_name.c_str());
}
/* An error message for JackVersionError will already
* be printed by JackInternalClient::Open().
* Therefore no need to handle it here.
*/
jack_error("Cannot load client %s from internal session file line %u. Ignoring the line!", client_name.c_str(), linenr);
return;
}
/* status has not to be checked for JackFailure
* because JackServer::InternalClientLoad1() will return a value < 0
* and this is handled by the previous if-clause.
*/
jack_info("Internal client %s successfully loaded", client_name.c_str());
}
void JackInternalSessionLoader::ConnectPorts(std::istringstream& iss, const int linenr)
{
std::string src_port;
if ( !(iss >> src_port) ) {
jack_error("Cannot read first port from internal session file line %u '%s'. Ignoring the line!",
linenr, iss.str().c_str());
return;
}
std::string dst_port;
if ( !(iss >> dst_port) ) {
jack_error("Cannot read second port from internal session file line %u '%s'. Ignoring the line!",
linenr, iss.str().c_str());
return;
}
/* use the client reference of the source port */
const jack_port_id_t src_port_index = fServer->GetGraphManager()->GetPort(src_port.c_str());
if (src_port_index >= NO_PORT) {
jack_error("Source port %s does not exist! Ignoring internal session file line %u '%s'.",
src_port.c_str(), linenr, iss.str().c_str());
return;
}
const int src_refnum = fServer->GetGraphManager()->GetOutputRefNum(src_port_index);
if (fServer->GetEngine()->PortConnect(src_refnum, src_port.c_str(), dst_port.c_str()) < 0) {
jack_error("Cannot connect ports of internal session file line %u '%s'.\n"
"Possibly the destination port does not exist. Ignoring the line!",
linenr, iss.str().c_str());
return;
}
jack_info("Ports connected: %s -> %s", src_port.c_str(), dst_port.c_str());
}
}

46
common/JackInternalSessionLoader.h
View File

@ -1,46 +0,0 @@
/*
Copyright (C) 2017 Timo Wischer
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __JackInternalSessionLoader__
#define __JackInternalSessionLoader__
#include <string>
#include <sstream>
#include "JackServer.h"
namespace Jack
{
class JackInternalSessionLoader
{
public:
JackInternalSessionLoader(JackServer* const server);
int Load(const char* file);
private:
void LoadClient(std::istringstream& iss, const int linenr);
void ConnectPorts(std::istringstream& iss, const int linenr);
JackServer* const fServer;
};
} // end of namespace
#endif

11
common/JackServer.cpp
View File

@ -33,7 +33,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackInternalClient.h"
#include "JackError.h"
#include "JackMessageBuffer.h"
#include "JackInternalSessionLoader.h"
const char * jack_get_self_connect_mode_description(char mode);
@ -226,16 +225,6 @@ int JackServer::InternalClientLoadAux(JackLoadableInternalClient* client, const
}
}
//-----------------------
// Internal session file
//-----------------------
int JackServer::LoadInternalSessionFile(const char* file)
{
JackInternalSessionLoader loader(this);
return loader.Load(file);
}
//---------------------------
// From request thread : API
//---------------------------

3
common/JackServer.h
View File

@ -87,9 +87,6 @@ class SERVER_EXPORT JackServer
int InternalClientLoad1(const char* client_name, const char* so_name, const char* objet_data, int options, int* int_ref, jack_uuid_t uuid, int* status);
int InternalClientLoad2(const char* client_name, const char* so_name, const JSList * parameters, int options, int* int_ref, jack_uuid_t uuid, int* status);
// Internal session file
int LoadInternalSessionFile(const char* file);
// Transport management
int ReleaseTimebase(int refnum);
int SetTimebaseCallback(int refnum, int conditional);

1
common/wscript
View File

@ -292,7 +292,6 @@ def build(bld):
'JackExternalClient.cpp',
'JackFreewheelDriver.cpp',
'JackInternalClient.cpp',
'JackInternalSessionLoader.cpp',
'JackServer.cpp',
'JackThreadedDriver.cpp',
'JackRestartThreadedDriver.cpp',