diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/bindings/Client.hpp | 2 | ||||
| -rw-r--r-- | src/bindings/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bindings/ingen_bindings.cpp | 3 | ||||
| -rw-r--r-- | src/libs/engine/NodeFactory.cpp | 1 | ||||
| -rw-r--r-- | src/libs/engine/events/CreateNodeEvent.cpp | 1 | ||||
| -rw-r--r-- | src/libs/module/World.hpp | 5 | ||||
| -rw-r--r-- | src/libs/module/global.cpp | 11 |
8 files changed, 11 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 9c9971a7..e375fb33 100644 --- a/configure.ac +++ b/configure.ac @@ -335,6 +335,7 @@ AC_MSG_RESULT([ Engine library/OSC server: $build_ingen_server]) AC_MSG_RESULT([ JACK in-process engine: $build_in_process_engine]) AC_MSG_RESULT([ Client library: $build_ingen_client_lib]) AC_MSG_RESULT([ GTK GUI: $build_ingen_gtk_client]) +AC_MSG_RESULT([ Language bindings: $bindings]) AC_MSG_RESULT([]) AC_MSG_RESULT([*** INGEN IS WITHOUT LASH SUPPORT AT THIS TIME ***]) AC_MSG_RESULT([]) diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp index 41479676..6f4010b1 100644 --- a/src/bindings/Client.hpp +++ b/src/bindings/Client.hpp @@ -42,6 +42,7 @@ public: virtual void new_plugin(const std::string& uri, const std::string& type_uri, + const std::string& symbol, const std::string& name) {} virtual void new_patch(const std::string& path, uint32_t poly) {} @@ -52,6 +53,7 @@ public: uint32_t num_ports) {} virtual void new_port(const std::string& path, + uint32_t index, const std::string& data_type, bool is_output) {} diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 3bc4c64d..016a6596 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -1,4 +1,4 @@ -FLAGS = @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/ingen/src/common +FLAGS = @INGEN_CFLAGS@ @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/ingen/src/common LIBS = @RAUL_LIBS@ @GLIBMM_LIBS@ -lpython2.4 AM_CXXFLAGS = -I/usr/include/python2.4 $(FLAGS) diff --git a/src/bindings/ingen_bindings.cpp b/src/bindings/ingen_bindings.cpp index 91832faf..30edb8e1 100644 --- a/src/bindings/ingen_bindings.cpp +++ b/src/bindings/ingen_bindings.cpp @@ -1,7 +1,8 @@ #include <iostream> #include "python2.4/Python.h" #include "ingen_bindings.hpp" -#include "../libs/engine/Engine.hpp" +#include "engine/Engine.hpp" +#include "module/World.hpp" using namespace std; diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index 949a5928..06d9ca1f 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -21,6 +21,7 @@ #include <dirent.h> #include <float.h> #include <cmath> +#include <redlandmm/World.hpp> #include "module/World.hpp" #include "NodeFactory.hpp" #include "ThreadManager.hpp" diff --git a/src/libs/engine/events/CreateNodeEvent.cpp b/src/libs/engine/events/CreateNodeEvent.cpp index 9a882209..7589b150 100644 --- a/src/libs/engine/events/CreateNodeEvent.cpp +++ b/src/libs/engine/events/CreateNodeEvent.cpp @@ -18,6 +18,7 @@ #include <raul/Maid.hpp> #include <raul/Path.hpp> #include <raul/Path.hpp> +#include <redlandmm/World.hpp> #include "module/World.hpp" #include "CreateNodeEvent.hpp" #include "Responder.hpp" diff --git a/src/libs/module/World.hpp b/src/libs/module/World.hpp index 29434069..f6c5a67a 100644 --- a/src/libs/module/World.hpp +++ b/src/libs/module/World.hpp @@ -23,19 +23,18 @@ #include <string> #include <glibmm/module.h> #include <raul/SharedPtr.hpp> -#include <redlandmm/World.hpp> #include "shared/LV2Features.hpp" #ifdef HAVE_SLV2 #include <slv2/slv2.h> #endif -namespace Ingen { +namespace Redland { class World; } +namespace Ingen { class Engine; namespace Shared { - class EngineInterface; diff --git a/src/libs/module/global.cpp b/src/libs/module/global.cpp index a8a2720d..c78f9fc3 100644 --- a/src/libs/module/global.cpp +++ b/src/libs/module/global.cpp @@ -16,6 +16,7 @@ */ #include <iostream> +#include <redlandmm/World.hpp> #include "global.hpp" #include "World.hpp" @@ -37,11 +38,6 @@ get_world() { static World* world = NULL; - if (&world == NULL) { - cerr << "ERROR: Ingen::Shared::world undefined." << endl; - return NULL; - } - if (!world) { world = new World(); world->rdf_world = new Redland::World(); @@ -61,11 +57,6 @@ get_world() void destroy_world() { - if (&world == NULL) { - cerr << "ERROR: Ingen::Shared::world undefined." << endl; - return; - } - if (world) { #ifdef HAVE_SLV2 slv2_world_free(world->slv2_world); |