summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/EventSink.cpp10
-rw-r--r--src/engine/EventSink.hpp3
-rw-r--r--src/engine/JackAudioDriver.cpp8
-rw-r--r--src/engine/JackAudioDriver.hpp4
-rw-r--r--src/engine/PortImpl.cpp1
-rw-r--r--src/engine/wscript73
6 files changed, 51 insertions, 48 deletions
diff --git a/src/engine/EventSink.cpp b/src/engine/EventSink.cpp
index 6c775d4c..5e7305e4 100644
--- a/src/engine/EventSink.cpp
+++ b/src/engine/EventSink.cpp
@@ -16,7 +16,6 @@
*/
#include <iostream>
-#include "events/SendPortValueEvent.hpp"
#include "EventSink.hpp"
#include "PortImpl.hpp"
@@ -24,15 +23,6 @@ using namespace std;
namespace Ingen {
-#if 0
-void
-EventSink::control_change(Port* port, FrameTime time, float val)
-{
- //cerr << "CONTROL CHANGE: " << port->path() << " == " << val << endl;
- SendPortValueEvent ev(_engine, time, port, false, 0, val);
- _events.write(sizeof(ev), (uchar*)&ev);
-}
-#endif
/** \a size is not size_t because an event will never be even remotely close
* to UINT32_MAX in size, so uint32_t saves wasted space on 64-bit.
diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp
index 9e937d1a..72341b7b 100644
--- a/src/engine/EventSink.hpp
+++ b/src/engine/EventSink.hpp
@@ -21,14 +21,13 @@
#include <list>
#include <utility>
#include <raul/RingBuffer.hpp>
-#include "events/SendPortValueEvent.hpp"
#include "types.hpp"
namespace Ingen {
class PortImpl;
class Engine;
-class SendPortValueEvent;
+class Event;
/** Sink for events generated in the audio thread.
diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp
index 15c8f785..f0c402d9 100644
--- a/src/engine/JackAudioDriver.cpp
+++ b/src/engine/JackAudioDriver.cpp
@@ -97,6 +97,7 @@ JackAudioPort::prepare_buffer(jack_nframes_t nframes)
JackAudioDriver::JackAudioDriver(Engine& engine,
std::string server_name,
+ std::string client_name,
jack_client_t* jack_client)
: _engine(engine)
, _jack_thread(NULL)
@@ -111,7 +112,7 @@ JackAudioDriver::JackAudioDriver(Engine& engine,
if (!_client) {
// Try supplied server name
if (server_name != "") {
- _client = jack_client_open("Ingen", JackServerName, NULL, server_name.c_str());
+ _client = jack_client_open(client_name.c_str(), JackServerName, NULL, server_name.c_str());
if (_client)
cerr << "[JackAudioDriver] Connected to JACK server '" <<
server_name << "'" << endl;
@@ -120,7 +121,7 @@ JackAudioDriver::JackAudioDriver(Engine& engine,
// Either server name not specified, or supplied server name does not exist
// Connect to default server
if (!_client) {
- _client = jack_client_open("Ingen", JackNullOption, NULL);
+ _client = jack_client_open(client_name.c_str(), JackNullOption, NULL);
if (_client)
cerr << "[JackAudioDriver] Connected to default JACK server." << endl;
@@ -390,8 +391,9 @@ Ingen::JackAudioDriver*
new_jack_audio_driver(
Ingen::Engine& engine,
std::string server_name,
+ std::string client_name,
jack_client_t* jack_client)
{
- return new Ingen::JackAudioDriver(engine, server_name, jack_client);
+ return new Ingen::JackAudioDriver(engine, server_name, client_name, jack_client);
}
diff --git a/src/engine/JackAudioDriver.hpp b/src/engine/JackAudioDriver.hpp
index 8cf2e5d3..56ae066b 100644
--- a/src/engine/JackAudioDriver.hpp
+++ b/src/engine/JackAudioDriver.hpp
@@ -73,7 +73,8 @@ class JackAudioDriver : public AudioDriver
{
public:
JackAudioDriver(Engine& engine,
- std::string server_name = "",
+ std::string server_name = "default",
+ std::string client_name = "ingen",
jack_client_t* jack_client = 0);
~JackAudioDriver();
@@ -187,6 +188,7 @@ extern "C" {
extern Ingen::JackAudioDriver* new_jack_audio_driver(
Ingen::Engine& engine,
std::string server_name = "",
+ std::string client_name = "",
jack_client_t* jack_client = 0);
}
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 49887453..d807304e 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -24,6 +24,7 @@
#include "AudioBuffer.hpp"
#include "EventBuffer.hpp"
#include "ProcessContext.hpp"
+#include "events/SendPortValueEvent.hpp"
#include "events/SendPortActivityEvent.hpp"
using namespace std;
diff --git a/src/engine/wscript b/src/engine/wscript
index ad5c3a96..5bf263d3 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -35,38 +35,11 @@ def build(bld):
PostProcessor.cpp
ProcessSlave.cpp
QueuedEvent.cpp
- QueuedEventSource.cpp
TransportNode.cpp
ingen_engine.cpp
- events/AllNotesOffEvent.cpp
- events/ClearPatchEvent.cpp
- events/ConnectionEvent.cpp
- events/CreateNodeEvent.cpp
- events/CreatePatchEvent.cpp
- events/CreatePortEvent.cpp
- events/DeactivateEvent.cpp
- events/DestroyEvent.cpp
- events/DisconnectAllEvent.cpp
- events/DisconnectionEvent.cpp
- events/EnablePatchEvent.cpp
- events/LoadPluginsEvent.cpp
- events/MidiLearnEvent.cpp
- events/NoteEvent.cpp
- events/RegisterClientEvent.cpp
- events/RenameEvent.cpp
- events/RequestAllObjectsEvent.cpp
- events/RequestMetadataEvent.cpp
- events/RequestObjectEvent.cpp
- events/RequestPluginEvent.cpp
- events/RequestPluginsEvent.cpp
- events/RequestPortValueEvent.cpp
- events/SendPortActivityEvent.cpp
- events/SendPortValueEvent.cpp
- events/SetMetadataEvent.cpp
- events/SetPolyphonicEvent.cpp
- events/SetPolyphonyEvent.cpp
- events/SetPortValueEvent.cpp
- events/UnregisterClientEvent.cpp
+ events/SendPortActivityEvent.cpp
+ events/SendPortValueEvent.cpp
+
'''
if bld.env()['HAVE_LADSPA']:
obj.source += ' LADSPANode.cpp '
@@ -80,7 +53,43 @@ def build(bld):
autowaf.use_lib(bld, obj, core_libs)
if bld.env()['HAVE_SOUP'] or bld.env()['HAVE_LIBLO']:
- obj.source += ' QueuedEngineInterface.cpp '
+ obj = bld.create_obj('cpp', 'shlib')
+ obj.source = '''
+ events/SetPortValueEvent.cpp
+ QueuedEventSource.cpp
+ events/AllNotesOffEvent.cpp
+ events/ClearPatchEvent.cpp
+ events/ConnectionEvent.cpp
+ events/CreateNodeEvent.cpp
+ events/CreatePatchEvent.cpp
+ events/CreatePortEvent.cpp
+ events/DeactivateEvent.cpp
+ events/DestroyEvent.cpp
+ events/DisconnectAllEvent.cpp
+ events/DisconnectionEvent.cpp
+ events/EnablePatchEvent.cpp
+ events/LoadPluginsEvent.cpp
+ events/MidiLearnEvent.cpp
+ events/NoteEvent.cpp
+ events/RegisterClientEvent.cpp
+ events/RenameEvent.cpp
+ events/RequestAllObjectsEvent.cpp
+ events/RequestMetadataEvent.cpp
+ events/RequestObjectEvent.cpp
+ events/RequestPluginEvent.cpp
+ events/RequestPluginsEvent.cpp
+ events/RequestPortValueEvent.cpp
+
+ events/SetMetadataEvent.cpp
+ events/SetPolyphonicEvent.cpp
+ events/SetPolyphonyEvent.cpp
+ events/UnregisterClientEvent.cpp
+ '''
+ obj.includes = ['.', '..', '../common', './events', '../engine']
+ obj.name = 'libingen_engine_queued'
+ obj.target = 'ingen_engine_queued'
+ obj.inst_dir = 'lib/ingen'
+ autowaf.use_lib(bld, obj, core_libs)
if bld.env()['HAVE_SOUP']:
obj = bld.create_obj('cpp', 'shlib')
@@ -93,7 +102,7 @@ def build(bld):
if bld.env()['HAVE_LIBLO']:
obj = bld.create_obj('cpp', 'shlib')
- obj.source = 'OSCClientSender.cpp OSCEngineReceiver.cpp'
+ obj.source = 'QueuedEngineInterface.cpp OSCClientSender.cpp OSCEngineReceiver.cpp'
obj.includes = ['.', '..', '../common', './events', '../engine']
obj.name = 'libingen_engine_osc'
obj.target = 'ingen_engine_osc'
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 19:25:33 +0000