summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-09-08 06:40:17 +0000
committerDavid Robillard <d@drobilla.net>2006-09-08 06:40:17 +0000
commit9028938008fa22ca2fe0c4ac7677471ac499b63f (patch)
tree1c8750244ab9a4427cc1c9f805bfd6702186ed29 /src
parent43d51948ccae71b8f0a1c1710e25cf36da8d7d7c (diff)
downloadingen-9028938008fa22ca2fe0c4ac7677471ac499b63f.tar.gz
ingen-9028938008fa22ca2fe0c4ac7677471ac499b63f.tar.bz2
ingen-9028938008fa22ca2fe0c4ac7677471ac499b63f.zip
Removed PatchLibrarian dependency on OSC
git-svn-id: http://svn.drobilla.net/lad/ingen@121 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/libs/client/ModelEngineInterface.h3
-rw-r--r--src/libs/client/OSCEngineSender.h2
-rw-r--r--src/libs/client/PatchLibrarian.cpp2
-rw-r--r--src/libs/client/PatchLibrarian.h10
4 files changed, 8 insertions, 9 deletions
diff --git a/src/libs/client/ModelEngineInterface.h b/src/libs/client/ModelEngineInterface.h
index 2bc5db14..42b95d00 100644
--- a/src/libs/client/ModelEngineInterface.h
+++ b/src/libs/client/ModelEngineInterface.h
@@ -31,14 +31,13 @@ namespace Client {
class NodeModel;
class PresetModel;
class PatchModel;
-class ModelClientInterface;
/** Model-based engine command interface.
*
* \ingroup IngenClient
*/
-class ModelEngineInterface
+class ModelEngineInterface : public virtual Shared::EngineInterface
{
public:
virtual ~ModelEngineInterface() {}
diff --git a/src/libs/client/OSCEngineSender.h b/src/libs/client/OSCEngineSender.h
index 184c0569..91e2d559 100644
--- a/src/libs/client/OSCEngineSender.h
+++ b/src/libs/client/OSCEngineSender.h
@@ -37,7 +37,7 @@ namespace Client {
*
* \ingroup IngenClient
*/
-class OSCEngineSender : public EngineInterface
+class OSCEngineSender : virtual public EngineInterface
{
public:
OSCEngineSender(const string& engine_url);
diff --git a/src/libs/client/PatchLibrarian.cpp b/src/libs/client/PatchLibrarian.cpp
index e09ac23c..86f3d407 100644
--- a/src/libs/client/PatchLibrarian.cpp
+++ b/src/libs/client/PatchLibrarian.cpp
@@ -25,7 +25,7 @@
#include "ConnectionModel.h"
#include "PortModel.h"
#include "PresetModel.h"
-#include "OSCModelEngineInterface.h"
+#include "ModelEngineInterface.h"
#include "PluginModel.h"
#include "util/Path.h"
#include <iostream>
diff --git a/src/libs/client/PatchLibrarian.h b/src/libs/client/PatchLibrarian.h
index 5c199974..a41d47e3 100644
--- a/src/libs/client/PatchLibrarian.h
+++ b/src/libs/client/PatchLibrarian.h
@@ -33,7 +33,7 @@ class PatchModel;
class NodeModel;
class ConnectionModel;
class PresetModel;
-class OSCModelEngineInterface;
+class ModelEngineInterface;
class ModelClientInterface;
@@ -46,8 +46,8 @@ class PatchLibrarian
public:
// FIXME: return booleans and set an errstr that can be checked or something?
- PatchLibrarian(OSCModelEngineInterface* osc_model_engine_interface)
- : _patch_search_path("."), _engine(osc_model_engine_interface)
+ PatchLibrarian(ModelEngineInterface* _engine)
+ : _patch_search_path("."), _engine(_engine)
{
assert(_engine);
}
@@ -63,8 +63,8 @@ public:
private:
string translate_load_path(const string& path);
- string _patch_search_path;
- OSCModelEngineInterface* const _engine;
+ string _patch_search_path;
+ ModelEngineInterface* const _engine;
/// Translations of paths from the loading file to actual paths (for deprecated patches)
std::map<string, string> _load_path_translations;