diff options
| author | David Robillard <d@drobilla.net> | 2007-11-30 07:38:42 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-11-30 07:38:42 +0000 |
| commit | dbaf3eaff06b05fe8901bfe800c76435fc024e3c (patch) | |
| tree | 64c328e0a8cfb7bdb4eed4937bc2705fe929a41f /src/gui | |
| parent | b36e00c19a932b254f81e2fa71b808c440909739 (diff) | |
| download | machina-dbaf3eaff06b05fe8901bfe800c76435fc024e3c.tar.gz machina-dbaf3eaff06b05fe8901bfe800c76435fc024e3c.tar.bz2 machina-dbaf3eaff06b05fe8901bfe800c76435fc024e3c.zip | |
Split redland C++ wrappers out from Raul.
git-svn-id: http://svn.drobilla.net/lad/machina@927 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 6 | ||||
| -rw-r--r-- | src/gui/Makefile.am | 39 | ||||
| -rw-r--r-- | src/gui/main.cpp | 2 |
3 files changed, 32 insertions, 15 deletions
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 8472d5f..6f8881e 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -22,7 +22,7 @@ #include <pthread.h> #include <libgnomecanvasmm.h> #include <libglademm/xml.h> -#include <raul/RDFModel.hpp> +#include <redlandmm/Model.hpp> #include <machina/Machine.hpp> #include <machina/SMFDriver.hpp> #include "GladeXml.hpp" @@ -270,7 +270,7 @@ MachinaGUI::menu_file_save() if (!raptor_uri_uri_string_is_file_uri((const unsigned char*)_save_uri.c_str())) menu_file_save_as(); - Raul::RDF::Model model(_engine->rdf_world()); + Redland::Model model(_engine->rdf_world()); model.set_base_uri(_save_uri); machine()->write_state(model); model.serialise_to_file(_save_uri); @@ -322,7 +322,7 @@ MachinaGUI::menu_file_save_as() fin.close(); if (confirm) { - Raul::RDF::Model model(_engine->rdf_world()); + Redland::Model model(_engine->rdf_world()); _save_uri = uri; model.set_base_uri(_save_uri); _engine->machine()->write_state(model); diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index f6a2ef2..9458e89 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,4 +1,14 @@ -AM_CXXFLAGS = -I$(top_srcdir)/flowcanvas -I$(top_srcdir)/raul -I$(top_srcdir)/machina/src/engine -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @GTHREAD_CFLAGS@ +AM_CXXFLAGS = \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -I$(top_srcdir)/flowcanvas \ + -I$(top_srcdir)/machina/src/engine \ + -I$(top_srcdir)/raul \ + @GNOMECANVASMM_CFLAGS@ \ + @GTHREAD_CFLAGS@ \ + @JACK_CFLAGS@ \ + @LIBGLADEMM_CFLAGS@ \ + @RAUL_CFLAGS@ \ + @REDLANDMM_CFLAGS@ EXTRA_DIST = machina.gladep @@ -9,22 +19,29 @@ globalpixmapsdir = $(datadir)/pixmaps dist_globalpixmaps_DATA = machina.svg machina_gui_SOURCES = \ - main.cpp \ + EdgeView.cpp \ + EdgeView.hpp \ GladeXml.hpp \ - MachinaGUI.hpp \ - MachinaGUI.cpp \ - MachinaCanvas.hpp \ MachinaCanvas.cpp \ - NodeView.hpp \ - NodeView.cpp \ - EdgeView.hpp \ - EdgeView.cpp \ + MachinaCanvas.hpp \ + MachinaGUI.cpp \ + MachinaGUI.hpp \ + NodePropertiesWindow.cpp \ NodePropertiesWindow.hpp \ - NodePropertiesWindow.cpp + NodeView.cpp \ + NodeView.hpp \ + main.cpp if WITH_MACHINA_GUI -machina_gui_LDADD = ../engine/libmachina.la @RAUL_LIBS@ @FLOWCANVAS_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ +machina_gui_LDADD = \ + ../engine/libmachina.la \ + @FLOWCANVAS_LIBS@ \ + @GNOMECANVASMM_LIBS@ \ + @JACK_LIBS@ \ + @LIBGLADEMM_LIBS@ \ + @RAUL_LIBS@ \ + @REDLANDMM_LIBS@ bin_PROGRAMS = machina_gui diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 527986b..680ec68 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) if ( ! Glib::thread_supported()) Glib::thread_init(); - Raul::RDF::World rdf_world; + Redland::World rdf_world; SharedPtr<Machina::Machine> machine; |