summaryrefslogtreecommitdiffstats
path: root/src/libs/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-03-14 01:26:14 +0000
committerDavid Robillard <d@drobilla.net>2008-03-14 01:26:14 +0000
commit77f45891e9948abe0c689210f488ae9347b725ad (patch)
treef6d410c2a611917d0259a0610e918cc54a5b5674 /src/libs/engine
parent7aa8ef117f97d4a3dd92cabfaf57a10e3ed83c79 (diff)
downloadingen-77f45891e9948abe0c689210f488ae9347b725ad.tar.gz
ingen-77f45891e9948abe0c689210f488ae9347b725ad.tar.bz2
ingen-77f45891e9948abe0c689210f488ae9347b725ad.zip
Exit clean on ctrl+c when running engine only.
git-svn-id: http://svn.drobilla.net/lad/ingen@1165 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine')
-rw-r--r--src/libs/engine/OSCEngineReceiver.cpp1
-rw-r--r--src/libs/engine/events/SetMetadataEvent.hpp7
2 files changed, 7 insertions, 1 deletions
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index 64bc66ec..20971e5a 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -157,6 +157,7 @@ void
OSCEngineReceiver::deactivate()
{
cout << "[OSCEngineReceiver] Stopped OSC listening thread" << endl;
+ _receive_thread->stop();
QueuedEventSource::deactivate();
}
diff --git a/src/libs/engine/events/SetMetadataEvent.hpp b/src/libs/engine/events/SetMetadataEvent.hpp
index 1d6a913e..457d3052 100644
--- a/src/libs/engine/events/SetMetadataEvent.hpp
+++ b/src/libs/engine/events/SetMetadataEvent.hpp
@@ -36,7 +36,12 @@ class GraphObjectImpl;
class SetMetadataEvent : public QueuedEvent
{
public:
- SetMetadataEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& path, const string& key, const Raul::Atom& value);
+ SetMetadataEvent(Engine& engine,
+ SharedPtr<Responder> responder,
+ SampleCount timestamp,
+ const string& path,
+ const string& key,
+ const Raul::Atom& value);
void pre_process();
void execute(ProcessContext& context);