From b1406a0e09b0cb27032ade94c58d9a471086b89a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 7 Oct 2007 19:59:13 +0000 Subject: Remove DSSI. git-svn-id: http://svn.drobilla.net/lad/ingen@838 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/DeprecatedLoader.cpp | 52 ------------------------------------ src/libs/client/NodeModel.cpp | 16 ----------- src/libs/client/NodeModel.hpp | 3 --- src/libs/client/PluginModel.hpp | 3 --- 4 files changed, 74 deletions(-) (limited to 'src/libs/client') diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index 96305884..4913b038 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -355,58 +355,6 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr nm->add_port(pm); #endif - // DSSI hacks. Stored in the patch files as special elements, but sent to - // the engine as normal metadata with specially formatted key/values. Not - // sure if this is the best way to go about this, but it's the least damaging - // right now - } else if ((!xmlStrcmp(cur->name, (const xmlChar*)"dssi-program"))) { - cerr << "FIXME: load dssi program\n"; -#if 0 - xmlNodePtr child = cur->xmlChildrenNode; - - string bank; - string program; - - while (child != NULL) { - key = xmlNodeListGetString(doc, child->xmlChildrenNode, 1); - - if ((!xmlStrcmp(child->name, (const xmlChar*)"bank"))) { - bank = (char*)key; - } else if ((!xmlStrcmp(child->name, (const xmlChar*)"program"))) { - program = (char*)key; - } - - xmlFree(key); - key = NULL; // Avoid a (possible?) double free - child = child->next; - } - nm->set_metadata("dssi-program", Atom(bank.append("/").append(program).c_str())); -#endif - - } else if ((!xmlStrcmp(cur->name, (const xmlChar*)"dssi-configure"))) { - cerr << "FIXME: load dssi configure\n"; -#if 0 - xmlNodePtr child = cur->xmlChildrenNode; - - string dssi_key; - string dssi_value; - - while (child != NULL) { - key = xmlNodeListGetString(doc, child->xmlChildrenNode, 1); - - if ((!xmlStrcmp(child->name, (const xmlChar*)"key"))) { - dssi_key = (char*)key; - } else if ((!xmlStrcmp(child->name, (const xmlChar*)"value"))) { - dssi_value = (char*)key; - } - - xmlFree(key); - key = NULL; // Avoid a (possible?) double free - - child = child->next; - } - nm->set_metadata(string("dssi-configure--").append(dssi_key), Atom(dssi_value.c_str())); -#endif } else { // Don't know what this tag is, add it as metadata if (key) add_metadata(initial_data, (const char*)cur->name, (const char*)key); diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp index 2816c7fa..c3348f89 100644 --- a/src/libs/client/NodeModel.cpp +++ b/src/libs/client/NodeModel.cpp @@ -137,22 +137,6 @@ NodeModel::get_port(const string& port_name) const } -void -NodeModel::add_program(int bank, int program, const string& name) -{ - _banks[bank][program] = name; -} - - -void -NodeModel::remove_program(int bank, int program) -{ - _banks[bank].erase(program); - if (_banks[bank].size() == 0) - _banks.erase(bank); -} - - void NodeModel::port_value_range(SharedPtr port, float& min, float& max) { diff --git a/src/libs/client/NodeModel.hpp b/src/libs/client/NodeModel.hpp index 080d8f4c..1df7f35e 100644 --- a/src/libs/client/NodeModel.hpp +++ b/src/libs/client/NodeModel.hpp @@ -51,8 +51,6 @@ public: SharedPtr get_port(const string& port_name) const; - const Table >& get_programs() const { return _banks; } - const string& plugin_uri() const { return _plugin_uri; } SharedPtr plugin() const { return _plugin; } uint32_t num_ports() const { return _ports.size(); } @@ -84,7 +82,6 @@ protected: PortModelList _ports; ///< List of ports (not a Table to preserve order) string _plugin_uri; ///< Plugin URI (if PluginModel is unknown) SharedPtr _plugin; ///< The plugin this node is an instance of - Table > _banks; ///< DSSI banks }; diff --git a/src/libs/client/PluginModel.hpp b/src/libs/client/PluginModel.hpp index f3d0a329..67a0295f 100644 --- a/src/libs/client/PluginModel.hpp +++ b/src/libs/client/PluginModel.hpp @@ -65,7 +65,6 @@ public: /*const char* const type_string() const { if (_type == LV2) return "LV2"; else if (_type == LADSPA) return "LADSPA"; - else if (_type == DSSI) return "DSSI"; else if (_type == Internal) return "Internal"; else if (_type == Patch) return "Patch"; else return ""; @@ -74,7 +73,6 @@ public: const char* const type_uri() const { if (_type == LV2) return "ingen:LV2"; else if (_type == LADSPA) return "ingen:LADSPA"; - else if (_type == DSSI) return "ingen:DSSI"; else if (_type == Internal) return "ingen:Internal"; else if (_type == Patch) return "ingen:Patch"; else return ""; @@ -84,7 +82,6 @@ public: void set_type(const string& type_string) { if (type_string == "LV2") _type = LV2; else if (type_string == "LADSPA") _type = LADSPA; - else if (type_string == "DSSI") _type = DSSI; else if (type_string == "Internal") _type = Internal; else if (type_string == "Patch") _type = Patch; } -- cgit v1.2.1