summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-09-08 06:23:25 +0000
committerDavid Robillard <d@drobilla.net>2006-09-08 06:23:25 +0000
commit43d51948ccae71b8f0a1c1710e25cf36da8d7d7c (patch)
treef81e18174cf0a798a908afb954f6595d6c0b72ab /src/progs
parent48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa (diff)
downloadingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.tar.gz
ingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.tar.bz2
ingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.zip
Renamed communications classes for consistency.
Removed engine dependency on OSC (mostly). git-svn-id: http://svn.drobilla.net/lad/ingen@120 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/ingenuity/ConnectWindow.cpp1
-rw-r--r--src/progs/ingenuity/Controller.cpp1
-rw-r--r--src/progs/ingenuity/main.cpp6
-rw-r--r--src/progs/server/main.cpp23
4 files changed, 20 insertions, 11 deletions
diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp
index 6715c4ed..f608c79c 100644
--- a/src/progs/ingenuity/ConnectWindow.cpp
+++ b/src/progs/ingenuity/ConnectWindow.cpp
@@ -22,7 +22,6 @@
#include "interface/ClientInterface.h"
#include "ThreadedSigClientInterface.h"
#include "Controller.h"
-#include "OSCListener.h"
#include "Store.h"
#include "PatchController.h"
#include "PatchModel.h"
diff --git a/src/progs/ingenuity/Controller.cpp b/src/progs/ingenuity/Controller.cpp
index 5b8253b8..bb7e4c9b 100644
--- a/src/progs/ingenuity/Controller.cpp
+++ b/src/progs/ingenuity/Controller.cpp
@@ -17,7 +17,6 @@
#include "PatchModel.h"
#include "PatchController.h"
#include "OSCModelEngineInterface.h"
-#include "OSCListener.h"
#include "PatchLibrarian.h"
#include "Controller.h"
#include "Loader.h"
diff --git a/src/progs/ingenuity/main.cpp b/src/progs/ingenuity/main.cpp
index 8419f009..0c504a11 100644
--- a/src/progs/ingenuity/main.cpp
+++ b/src/progs/ingenuity/main.cpp
@@ -25,17 +25,17 @@
#include "LashController.h"
#endif
#include "ThreadedSigClientInterface.h"
-#include "OSCListener.h"
+#include "OSCClientReceiver.h"
using Ingen::Shared::ClientInterface;
using namespace Ingenuity;
-class OSCSigEmitter : public OSCListener, public ThreadedSigClientInterface {
+class OSCSigEmitter : public OSCClientReceiver, public ThreadedSigClientInterface {
public:
OSCSigEmitter(size_t queue_size, int listen_port)
: Ingen::Shared::ClientInterface()
- , OSCListener(listen_port)
+ , OSCClientReceiver(listen_port)
, ThreadedSigClientInterface(queue_size)
{
Glib::signal_timeout().connect(
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp
index ec1788f0..926a739f 100644
--- a/src/progs/server/main.cpp
+++ b/src/progs/server/main.cpp
@@ -20,7 +20,9 @@
#include "config.h"
#include "util.h"
#include "cmdline.h"
+#include "tuning.h"
#include "Engine.h"
+#include "OSCEngineReceiver.h"
#ifdef HAVE_LASH
#include "LashDriver.h"
#endif
@@ -30,9 +32,9 @@
#endif
using std::cout; using std::endl; using std::cerr;
+using namespace Ingen;
-
-Ingen::Engine* engine;
+Engine* engine;
void
@@ -133,21 +135,30 @@ main(int argc, char** argv)
signal(SIGINT, catch_int);
signal(SIGTERM, catch_int);
- Ingen::set_denormal_flags();
+ set_denormal_flags();
+
+ engine = new Engine();
- engine = new Ingen::Engine(args_info.port_arg);
+ OSCEngineReceiver* receiver = new OSCEngineReceiver(
+ *engine, pre_processor_queue_size, args_info.port_arg);
+
+ receiver->activate();
+ engine->set_event_source(receiver);
#ifdef HAVE_LASH
- Ingen::lash_driver = new Ingen::LashDriver(Ingen::om, lash_args);
+ lash_driver = new LashDriver(engine, lash_args);
#endif
engine->main();
+ receiver->deactivate();
+
#ifdef HAVE_LASH
- delete Ingen::lash_driver;
+ delete lash_driver;
#endif
delete engine;
+ delete receiver;
}
return ret;