summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/client/DeprecatedLoader.cpp (renamed from src/libs/client/DeprecatedSerializer.cpp)86
-rw-r--r--src/libs/client/DeprecatedLoader.h (renamed from src/libs/client/DeprecatedSerializer.h)29
-rw-r--r--src/libs/client/Makefile.am4
-rw-r--r--src/progs/ingenuity/ThreadedLoader.cpp41
-rw-r--r--src/progs/ingenuity/ThreadedLoader.h19
5 files changed, 107 insertions, 72 deletions
diff --git a/src/libs/client/DeprecatedSerializer.cpp b/src/libs/client/DeprecatedLoader.cpp
index b8156a95..5b6eb2eb 100644
--- a/src/libs/client/DeprecatedSerializer.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -14,7 +14,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "DeprecatedSerializer.h"
+#include "DeprecatedLoader.h"
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
@@ -43,7 +43,7 @@ using std::cerr; using std::cout; using std::endl;
namespace Ingen {
namespace Client {
-
+#if 0
/** Searches for the filename passed in the path, returning the full
* path of the file, or the empty string if not found.
*
@@ -56,7 +56,7 @@ namespace Client {
* be a good idea to pass as additional_path, in the case of a subpatch.
*/
string
-DeprecatedSerializer::find_file(const string& filename, const string& additional_path)
+DeprecatedLoader::find_file(const string& filename, const string& additional_path)
{
string search_path = additional_path + ":" + _patch_search_path;
@@ -86,16 +86,17 @@ DeprecatedSerializer::find_file(const string& filename, const string& additional
is.close();
return full_patch_path;
} else {
- cerr << "[DeprecatedSerializer] Could not find patch file " << full_patch_path << endl;
+ cerr << "[DeprecatedLoader] Could not find patch file " << full_patch_path << endl;
}
}
return "";
}
+#endif
string
-DeprecatedSerializer::translate_load_path(const string& path)
+DeprecatedLoader::translate_load_path(const string& path)
{
std::map<string,string>::iterator t = _load_path_translations.find(path);
@@ -108,6 +109,38 @@ DeprecatedSerializer::translate_load_path(const string& path)
}
+/** Add a piece of data to a MetadataMap, translating from deprecated unqualified keys
+ *
+ * Adds a namespace prefix for known keys, and ignores the rest.
+ */
+void
+DeprecatedLoader::add_metadata(MetadataMap& data, string old_key, string value)
+{
+ string key = "";
+ if (old_key == "module-x")
+ key = "ingenuity:canvas-x";
+ else if (old_key == "module-y")
+ key = "ingenuity:canvas-y";
+
+ if (key != "") {
+ // FIXME: should this overwrite existing values?
+ if (data.find(key) == data.end()) {
+ // Hack to make module-x and module-y set as floats
+ char* c_val = strdup(value.c_str());
+ char* endptr = NULL;
+ float fval = strtof(c_val, &endptr);
+
+ if (endptr != c_val && *endptr == '\0')
+ data[key] = Atom(fval);
+ else
+ data[key]= Atom(value);
+
+ free(c_val);
+ }
+ }
+}
+
+
/** Load a patch in to the engine (and client) from a patch file.
*
* The name and poly from the passed PatchModel are used. If the name is
@@ -134,14 +167,14 @@ DeprecatedSerializer::translate_load_path(const string& path)
* Returns the path of the newly created patch.
*/
string
-DeprecatedSerializer::load_patch(const string& filename,
- const string& parent_path,
- const string& name,
- size_t poly,
- MetadataMap initial_data,
- bool existing)
+DeprecatedLoader::load_patch(const Glib::ustring& filename,
+ const Path& parent_path,
+ string name,
+ size_t poly,
+ MetadataMap initial_data,
+ bool existing)
{
- cerr << "[DeprecatedSerializer] Loading patch " << filename << "" << endl;
+ cerr << "[DeprecatedLoader] Loading patch " << filename << "" << endl;
Path path = "/"; // path of the new patch
@@ -197,8 +230,7 @@ DeprecatedSerializer::load_patch(const string& filename,
// Don't know what this tag is, add it as metadata without overwriting
// (so caller can set arbitrary parameters which will be preserved)
if (key)
- if (initial_data.find((const char*)cur->name) == initial_data.end())
- initial_data[(const char*)cur->name] = (const char*)key;
+ add_metadata(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
@@ -274,7 +306,7 @@ DeprecatedSerializer::load_patch(const string& filename,
/** Build a NodeModel given a pointer to a Node in a patch file.
*/
bool
-DeprecatedSerializer::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
+DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
{
xmlChar* key;
xmlNodePtr cur = node->xmlChildrenNode;
@@ -395,16 +427,8 @@ DeprecatedSerializer::load_node(const Path& parent, xmlDocPtr doc, const xmlNode
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) {
-
- // Hack to make module-x and module-y set as floats
- char* endptr = NULL;
- float fval = strtof((const char*)key, &endptr);
- if (endptr != (char*)key && *endptr == '\0')
- initial_data[(const char*)cur->name] = Atom(fval);
- else
- initial_data[(const char*)cur->name] = Atom((const char*)key);
- }
+ if (key)
+ add_metadata(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
key = NULL;
@@ -413,8 +437,8 @@ DeprecatedSerializer::load_node(const Path& parent, xmlDocPtr doc, const xmlNode
}
if (path == "") {
- cerr << "[DeprecatedSerializer] Malformed patch file (node tag has empty children)" << endl;
- cerr << "[DeprecatedSerializer] Node ignored." << endl;
+ cerr << "[DeprecatedLoader] Malformed patch file (node tag has empty children)" << endl;
+ cerr << "[DeprecatedLoader] Node ignored." << endl;
return false;
}
@@ -497,7 +521,7 @@ DeprecatedSerializer::load_node(const Path& parent, xmlDocPtr doc, const xmlNode
bool
-DeprecatedSerializer::load_subpatch(const Path& parent, xmlDocPtr doc, const xmlNodePtr subpatch)
+DeprecatedLoader::load_subpatch(const Path& parent, xmlDocPtr doc, const xmlNodePtr subpatch)
{
xmlChar *key;
xmlNodePtr cur = subpatch->xmlChildrenNode;
@@ -519,7 +543,7 @@ DeprecatedSerializer::load_subpatch(const Path& parent, xmlDocPtr doc, const xml
filename = (const char*)key;
} else { // Don't know what this tag is, add it as metadata
if (key != NULL && strlen((const char*)key) > 0)
- initial_data[(const char*)cur->name] = Atom((const char*)key);
+ add_metadata(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
key = NULL;
@@ -538,7 +562,7 @@ DeprecatedSerializer::load_subpatch(const Path& parent, xmlDocPtr doc, const xml
/** Build a ConnectionModel given a pointer to a connection in a patch file.
*/
bool
-DeprecatedSerializer::load_connection(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
+DeprecatedLoader::load_connection(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
{
xmlChar *key;
xmlNodePtr cur = node->xmlChildrenNode;
@@ -587,7 +611,7 @@ DeprecatedSerializer::load_connection(const Path& parent, xmlDocPtr doc, const x
/** Build a PresetModel given a pointer to a preset in a patch file.
*/
bool
-DeprecatedSerializer::load_preset(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
+DeprecatedLoader::load_preset(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
{
cerr << "FIXME: load preset\n";
#if 0
diff --git a/src/libs/client/DeprecatedSerializer.h b/src/libs/client/DeprecatedLoader.h
index 5ffe8731..e0200ea7 100644
--- a/src/libs/client/DeprecatedSerializer.h
+++ b/src/libs/client/DeprecatedLoader.h
@@ -20,8 +20,9 @@
#include <map>
#include <utility>
#include <string>
-#include <libxml/tree.h>
#include <cassert>
+#include <glibmm/ustring.h>
+#include <libxml/tree.h>
#include "raul/SharedPtr.h"
#include "raul/Path.h"
#include "ObjectModel.h"
@@ -42,31 +43,33 @@ class ModelEngineInterface;
*
* \ingroup IngenClient
*/
-class DeprecatedSerializer
+class DeprecatedLoader
{
public:
- DeprecatedSerializer(SharedPtr<ModelEngineInterface> engine)
- : _patch_search_path("."), _engine(engine)
+ DeprecatedLoader(SharedPtr<ModelEngineInterface> engine)
+ : /*_patch_search_path(".")*/ _engine(engine)
{
assert(_engine);
}
- void path(const string& path) { _patch_search_path = path; }
- const string& path() { return _patch_search_path; }
+ /*void path(const string& path) { _patch_search_path = path; }
+ const string& path() { return _patch_search_path; }*/
string find_file(const string& filename, const string& additional_path = "");
- string load_patch(const string& filename,
- const string& parent_path,
- const string& name,
- size_t poly,
- MetadataMap initial_data,
- bool existing = false);
+ string load_patch(const Glib::ustring& filename,
+ const Path& parent_path,
+ string name,
+ size_t poly,
+ MetadataMap initial_data,
+ bool existing = false);
private:
+ void add_metadata(MetadataMap& data, string key, string value);
+
string translate_load_path(const string& path);
- string _patch_search_path;
+ //string _patch_search_path;
SharedPtr<ModelEngineInterface> _engine;
/// Translations of paths from the loading file to actual paths (for deprecated patches)
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 73de7bda..c2bf662b 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -36,8 +36,8 @@ libingenclient_la_SOURCES = \
Serializer.cpp \
Loader.h \
Loader.cpp \
- DeprecatedSerializer.h \
- DeprecatedSerializer.cpp \
+ DeprecatedLoader.h \
+ DeprecatedLoader.cpp \
ConnectionModel.h \
ConnectionModel.cpp \
Store.h \
diff --git a/src/progs/ingenuity/ThreadedLoader.cpp b/src/progs/ingenuity/ThreadedLoader.cpp
index 83b3d6b5..e63e7f54 100644
--- a/src/progs/ingenuity/ThreadedLoader.cpp
+++ b/src/progs/ingenuity/ThreadedLoader.cpp
@@ -18,7 +18,6 @@
#include <fstream>
#include <cassert>
#include <string>
-#include "Loader.h"
#include "PatchModel.h"
using std::cout; using std::endl;
@@ -26,11 +25,9 @@ namespace Ingenuity {
ThreadedLoader::ThreadedLoader(SharedPtr<ModelEngineInterface> engine)
-: _loader(new Loader(engine))
-, _serializer(new Serializer())
+ : _deprecated_loader(engine)
+ , _loader(engine)
{
- assert(_loader != NULL);
-
// FIXME: rework this so the thread is only present when it's doing something (save mem)
start();
}
@@ -38,7 +35,6 @@ ThreadedLoader::ThreadedLoader(SharedPtr<ModelEngineInterface> engine)
ThreadedLoader::~ThreadedLoader()
{
- delete _loader;
}
@@ -67,13 +63,26 @@ ThreadedLoader::load_patch(bool merge,
{
_mutex.lock();
- _events.push_back(sigc::hide_return(sigc::bind(
- sigc::mem_fun(_loader, &Loader::load),
- data_base_uri,
- engine_parent,
- (engine_name) ? engine_name.get() : "",
- "",
- engine_data )));
+ // FIXME: Filthy hack to load deprecated patches based on file extension
+ if (data_base_uri.substr(data_base_uri.length()-3) == ".om") {
+ _events.push_back(sigc::hide_return(sigc::bind(
+ sigc::mem_fun(_deprecated_loader, &DeprecatedLoader::load_patch),
+ data_base_uri,
+ engine_parent,
+ (engine_name) ? engine_name.get() : "",
+ (engine_poly) ? engine_poly.get() : 1,
+ engine_data,
+ false)));
+ } else {
+ _events.push_back(sigc::hide_return(sigc::bind(
+ sigc::mem_fun(_loader, &Loader::load),
+ data_base_uri,
+ engine_parent,
+ (engine_name) ? engine_name.get() : "",
+ // FIXME: poly here
+ "",
+ engine_data )));
+ }
_mutex.unlock();
@@ -102,9 +111,9 @@ ThreadedLoader::save_patch_event(SharedPtr<PatchModel> model, const string& file
if (recursive)
cerr << "FIXME: Recursive save." << endl;
- _serializer->start_to_filename(filename);
- _serializer->serialize(model);
- _serializer->finish();
+ _serializer.start_to_filename(filename);
+ _serializer.serialize(model);
+ _serializer.finish();
}
diff --git a/src/progs/ingenuity/ThreadedLoader.h b/src/progs/ingenuity/ThreadedLoader.h
index d5901a74..82080c94 100644
--- a/src/progs/ingenuity/ThreadedLoader.h
+++ b/src/progs/ingenuity/ThreadedLoader.h
@@ -28,14 +28,12 @@
#include "ModelEngineInterface.h"
#include "ObjectModel.h"
#include "Serializer.h"
+#include "DeprecatedLoader.h"
+#include "Loader.h"
using std::string;
using std::list;
using boost::optional;
-namespace Ingen { namespace Client {
- class Loader;
- class PatchModel;
-} }
using namespace Ingen::Client;
namespace Ingenuity {
@@ -58,8 +56,8 @@ public:
ThreadedLoader(SharedPtr<ModelEngineInterface> engine);
~ThreadedLoader();
- Loader& loader() const { return *_loader; }
- Serializer& serializer() const { return *_serializer; }
+ //Loader& loader() const { return *_loader; }
+ //Serializer& serializer() const { return *_serializer; }
// FIXME: there's a pattern here....
// (same core interface as Loader/Serializer)
@@ -83,10 +81,11 @@ private:
void _whipped();
- Loader* const _loader;
- Serializer* const _serializer;
- Mutex _mutex;
- list<Closure> _events;
+ DeprecatedLoader _deprecated_loader;
+ Loader _loader;
+ Serializer _serializer;
+ Mutex _mutex;
+ list<Closure> _events;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 15:12:39 +0000