summaryrefslogtreecommitdiffstats
path: root/src/libs/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-11-30 07:38:42 +0000
committerDavid Robillard <d@drobilla.net>2007-11-30 07:38:42 +0000
commit58af61933fe938c404b8fcd916b3939257663cdd (patch)
treed8dc1d63966756cc652178359f2b00982109a29f /src/libs/gui
parent61e1e6e1442e97365db33b6071f8710a68987d64 (diff)
downloadingen-58af61933fe938c404b8fcd916b3939257663cdd.tar.gz
ingen-58af61933fe938c404b8fcd916b3939257663cdd.tar.bz2
ingen-58af61933fe938c404b8fcd916b3939257663cdd.zip
Split redland C++ wrappers out from Raul.
git-svn-id: http://svn.drobilla.net/lad/ingen@927 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui')
-rw-r--r--src/libs/gui/App.cpp2
-rw-r--r--src/libs/gui/LoadRemotePatchWindow.cpp10
-rw-r--r--src/libs/gui/Makefile.am28
3 files changed, 27 insertions, 13 deletions
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 78f9e6e8..bc9148ed 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -97,7 +97,7 @@ App::App(Ingen::Shared::World* world)
glade_xml->get_widget_derived("patch_tree_win", _patch_tree_window);
glade_xml->get_widget("about_win", _about_dialog);
- Raul::RDF::World& rdf_world = *world->rdf_world;
+ Redland::World& rdf_world = *world->rdf_world;
rdf_world.add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#");
rdf_world.add_prefix("ingen", "http://drobilla.net/ns/ingen#");
diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp
index 4c529d40..d4a9329f 100644
--- a/src/libs/gui/LoadRemotePatchWindow.cpp
+++ b/src/libs/gui/LoadRemotePatchWindow.cpp
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <dirent.h>
#include <boost/optional/optional.hpp>
-#include <raul/RDFQuery.hpp>
+#include <redlandmm/Query.hpp>
#include "client/PatchModel.hpp"
#include "interface/EngineInterface.hpp"
#include "module/World.hpp"
@@ -67,19 +67,19 @@ LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Variabl
set_patch(patch);
_initial_data = data;
- RDF::Model model(*App::instance().world()->rdf_world,
+ Redland::Model model(*App::instance().world()->rdf_world,
"http://rdf.drobilla.net/ingen_patches/index.ttl",
"http://rdf.drobilla.net/ingen_patches/");
- RDF::Query query(*App::instance().world()->rdf_world, Glib::ustring(
+ Redland::Query query(*App::instance().world()->rdf_world, Glib::ustring(
"SELECT DISTINCT ?name ?uri WHERE {"
" ?uri a ingen:Patch ;"
" doap:name ?name ."
"}"));
- RDF::Query::Results results = query.run(*App::instance().world()->rdf_world, model);
+ Redland::Query::Results results = query.run(*App::instance().world()->rdf_world, model);
- for (RDF::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
+ for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
Gtk::TreeModel::iterator iter = _liststore->append();
(*iter)[_columns._col_name] = (*i)["name"].to_string();
(*iter)[_columns._col_uri] = (*i)["uri"].to_string();
diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am
index e45b095a..9e55afab 100644
--- a/src/libs/gui/Makefile.am
+++ b/src/libs/gui/Makefile.am
@@ -12,20 +12,34 @@ moduledir = $(libdir)/ingen
module_LTLIBRARIES = libingen_gui.la
libingen_gui_la_CXXFLAGS = \
+ -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" \
-DPKGDATADIR=\"$(pkgdatadir)\" \
- @SLV2_CFLAGS@ @RAUL_CFLAGS@ @FLOWCANVAS_CFLAGS@ \
+ @CURL_CFLAGS@ \
+ @FLOWCANVAS_CFLAGS@ \
+ @GNOMECANVASMM_CFLAGS@ \
+ @GTKMM_CFLAGS@ \
@INGEN_CFLAGS@ \
- -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" \
- @LIBLO_CFLAGS@ @CURL_CFLAGS@ \
- @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@
+ @LIBGLADEMM_CFLAGS@ \
+ @LIBLO_CFLAGS@ \
+ @REDLANDMM_CFLAGS@ \
+ @RAUL_CFLAGS@ \
+ @SLV2_CFLAGS@
+
libingen_gui_la_LDFLAGS = -no-undefined -module -avoid-version
libingen_gui_la_LIBADD = \
- @RAUL_LIBS@ @LIBLO_LIBS@ @SLV2_LIBS@ @CURL_LIBS@ \
- @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @FLOWCANVAS_LIBS@ @GNOMECANVASMM_LIBS@ \
+ ../client/libingen_client.la \
../module/libingen_module.la \
- ../client/libingen_client.la
+ @CURL_LIBS@ \
+ @FLOWCANVAS_LIBS@ \
+ @GNOMECANVASMM_LIBS@ \
+ @GTKMM_LIBS@ \
+ @LIBGLADEMM_LIBS@ \
+ @LIBLO_LIBS@ \
+ @REDLANDMM_LIBS@ \
+ @RAUL_LIBS@ \
+ @SLV2_LIBS@
libingen_gui_la_SOURCES = \
gui.hpp \