summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-12-09 19:08:03 +0000
committerDavid Robillard <d@drobilla.net>2006-12-09 19:08:03 +0000
commitc9fdc9d94f3d6081e36e98f5ae6cc03f361e8057 (patch)
tree8cfe823900c227341a051c0f96d9783dbbb6e64e /src/progs
parentd5e8ce8127784fc67953ab3b6247e911be697cc2 (diff)
downloadingen-c9fdc9d94f3d6081e36e98f5ae6cc03f361e8057.tar.gz
ingen-c9fdc9d94f3d6081e36e98f5ae6cc03f361e8057.tar.bz2
ingen-c9fdc9d94f3d6081e36e98f5ae6cc03f361e8057.zip
More loading progress (node positions restore).
git-svn-id: http://svn.drobilla.net/lad/ingen@215 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/patch_loader/Makefile.am4
-rw-r--r--src/progs/patch_loader/patch_loader.cpp12
2 files changed, 7 insertions, 9 deletions
diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am
index 5b5d5db9..da9ba356 100644
--- a/src/progs/patch_loader/Makefile.am
+++ b/src/progs/patch_loader/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = README
-ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@
-ingen_load_LDADD = ../../libs/client/libingenclient.la @RAUL_LIBS@ @LSIGCPP_LIBS@
+ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ @RASQAL_CFLAGS@
+ingen_load_LDADD = ../../libs/client/libingenclient.la @RAUL_LIBS@ @LSIGCPP_LIBS@ @GLIBMM_LIBS@ @RASQAL_LIBS@
bin_PROGRAMS = ingen_load
diff --git a/src/progs/patch_loader/patch_loader.cpp b/src/progs/patch_loader/patch_loader.cpp
index eb222c33..ab5c2c53 100644
--- a/src/progs/patch_loader/patch_loader.cpp
+++ b/src/progs/patch_loader/patch_loader.cpp
@@ -14,9 +14,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "OSCModelEngineInterface.h"
-//#include "Serializer.h"
+#include "Loader.h"
#include "PatchModel.h"
#include "raul/Path.h"
#include <iostream>
@@ -53,7 +52,7 @@ int main(int argc, char** argv)
SharedPtr<OSCModelEngineInterface> engine(new OSCModelEngineInterface(engine_url));
- //Serializer serializer(engine);
+ Loader loader(engine);
/* Connect to engine */
engine->attach(-1, client_port);
@@ -71,10 +70,9 @@ int main(int argc, char** argv)
// Load patches
for (uint i=0; i < args_info.inputs_num; ++i) {
- cerr << "FIXME: load patch" << endl;
- //SharedPtr<PatchModel> pm(new PatchModel("", 0));
- //pm->filename(args_info.inputs[i]);
- //serializer.load_patch(pm, true);
+ cerr << "FIXME: load patch under root" << endl;
+ cerr << "Load " << args_info.inputs[i] << endl;
+ loader.load(args_info.inputs[i], "/");
}
return 0;