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

Removed PatchLibrarian dependency on OSC 

git-svn-id: http://svn.drobilla.net/lad@121 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
dave 2006-09-08 06:40:17 +00:00
parent f0eda10737
commit 819808fe8e
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ingen/src/libs/client/ModelEngineInterface.h
View File

@ -31,14 +31,13 @@ namespace Client {
class NodeModel; class NodeModel;
class PresetModel; class PresetModel;
class PatchModel; class PatchModel;
class ModelClientInterface;
/** Model-based engine command interface. /** Model-based engine command interface.
* *
* \ingroup IngenClient * \ingroup IngenClient
*/ */
class ModelEngineInterface class ModelEngineInterface : public virtual Shared::EngineInterface
{ {
public: public:
virtual ~ModelEngineInterface() {} virtual ~ModelEngineInterface() {}

2
ingen/src/libs/client/OSCEngineSender.h
View File

@ -37,7 +37,7 @@ namespace Client {
* *
* \ingroup IngenClient * \ingroup IngenClient
*/ */
class OSCEngineSender : public EngineInterface class OSCEngineSender : virtual public EngineInterface
{ {
public: public:
OSCEngineSender(const string& engine_url); OSCEngineSender(const string& engine_url);

2
ingen/src/libs/client/PatchLibrarian.cpp
View File

@ -25,7 +25,7 @@
#include "ConnectionModel.h" #include "ConnectionModel.h"
#include "PortModel.h" #include "PortModel.h"
#include "PresetModel.h" #include "PresetModel.h"
#include "OSCModelEngineInterface.h" #include "ModelEngineInterface.h"
#include "PluginModel.h" #include "PluginModel.h"
#include "util/Path.h" #include "util/Path.h"
#include <iostream> #include <iostream>

10
ingen/src/libs/client/PatchLibrarian.h
View File

@ -33,7 +33,7 @@ class PatchModel;
class NodeModel; class NodeModel;
class ConnectionModel; class ConnectionModel;
class PresetModel; class PresetModel;
class OSCModelEngineInterface; class ModelEngineInterface;
class ModelClientInterface; class ModelClientInterface;
@ -46,8 +46,8 @@ class PatchLibrarian
public: public:
// FIXME: return booleans and set an errstr that can be checked or something? // FIXME: return booleans and set an errstr that can be checked or something?
PatchLibrarian(OSCModelEngineInterface* osc_model_engine_interface) PatchLibrarian(ModelEngineInterface* _engine)
: _patch_search_path("."), _engine(osc_model_engine_interface) : _patch_search_path("."), _engine(_engine)
{ {
assert(_engine); assert(_engine);
} }
@ -63,8 +63,8 @@ public:
private: private:
string translate_load_path(const string& path); string translate_load_path(const string& path);
string _patch_search_path; string _patch_search_path;
OSCModelEngineInterface* const _engine; ModelEngineInterface* const _engine;
/// Translations of paths from the loading file to actual paths (for deprecated patches) /// Translations of paths from the loading file to actual paths (for deprecated patches)
std::map<string, string> _load_path_translations; std::map<string, string> _load_path_translations;