From 22b17482a552b0966a80c19d94651385357d5701 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Oct 2007 05:27:32 +0000 Subject: Fix patch serialisation to a string. Fix patch uploading. Closes ticket 100. git-svn-id: http://svn.drobilla.net/lad/ingen@892 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/PatchCanvas.cpp | 2 +- src/libs/gui/UploadPatchWindow.cpp | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'src/libs/gui') diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index ba17b24d..35e8ad71 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -460,7 +460,7 @@ void PatchCanvas::copy_selection() { Serialiser serialiser(*App::instance().world()->rdf_world); - serialiser.start_to_string(); + serialiser.start_to_string(""); for (list >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) { boost::shared_ptr module = boost::dynamic_pointer_cast(*m); diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp index 959bb1ae..c64bac50 100644 --- a/src/libs/gui/UploadPatchWindow.cpp +++ b/src/libs/gui/UploadPatchWindow.cpp @@ -237,11 +237,9 @@ UploadPatchWindow::upload_clicked() Glib::ustring symbol = _symbol_entry->get_text(); Glib::ustring short_name = _short_name_entry->get_text(); - _patch->set_variable("lv2:symbol", Atom(symbol)); - App::instance().engine()->set_variable(_patch->path(), "lv2:symbol", Atom(symbol)); - - _patch->set_variable("doap:name", Atom(short_name)); - App::instance().engine()->set_variable(_patch->path(), "doap:name", Atom(short_name)); + GraphObject::Variables extra_rdf; + extra_rdf.insert(make_pair("lv2:symbol", Atom(symbol))); + extra_rdf.insert(make_pair("doap:name", Atom(short_name))); _response = 0; _progress_pct = 0; @@ -250,15 +248,13 @@ UploadPatchWindow::upload_clicked() _upload_progress->set_text(""); Serialiser s(*App::instance().world()->rdf_world); - s.start_to_string(); - s.serialise(_patch); - const string str = s.finish(); - istringstream stream(str); - string url = "http://rdf.drobilla.net/ingen_patches/"; - url += symbol + ".ingen.ttl"; + const string uri = string("http://rdf.drobilla.net/ingen_patches/") + .append(symbol).append(".ingen.ttl"); + + const string str = s.to_string(_patch, uri, extra_rdf); - _thread = new UploadThread(this, str, url); + _thread = new UploadThread(this, str, uri); _thread->start(); -- cgit v1.2.1