summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/ingen/ClientInterface.hpp4
-rw-r--r--include/ingen/CommonInterface.hpp5
-rw-r--r--src/client/OSCClientReceiver.cpp6
-rw-r--r--src/client/PluginModel.hpp6
-rw-r--r--src/engine/OSCEngineReceiver.cpp1
-rw-r--r--src/shared/ResourceImpl.hpp2
6 files changed, 16 insertions, 8 deletions
diff --git a/include/ingen/ClientInterface.hpp b/include/ingen/ClientInterface.hpp
index c9ea9cd6..fc212850 100644
--- a/include/ingen/ClientInterface.hpp
+++ b/include/ingen/ClientInterface.hpp
@@ -22,9 +22,11 @@
#include <string>
+#include "raul/URI.hpp"
+
#include "ingen/CommonInterface.hpp"
-namespace Raul { class Path; class URI; }
+namespace Raul { class Path; }
namespace Ingen {
diff --git a/include/ingen/CommonInterface.hpp b/include/ingen/CommonInterface.hpp
index 603380d6..c42a3eea 100644
--- a/include/ingen/CommonInterface.hpp
+++ b/include/ingen/CommonInterface.hpp
@@ -18,11 +18,8 @@
#ifndef INGEN_INTERFACE_COMMONINTERFACE_HPP
#define INGEN_INTERFACE_COMMONINTERFACE_HPP
-#include "raul/Path.hpp"
-#include "raul/URI.hpp"
-
#include "ingen/CommonInterface.hpp"
-#include "ingen/GraphObject.hpp"
+#include "ingen/Resource.hpp"
namespace Raul { class Atom; class Path; class URI; }
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index 36661e70..31c0aa2a 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -24,6 +24,7 @@
#include "raul/log.hpp"
#include "raul/AtomLiblo.hpp"
+#include "raul/Path.hpp"
#include "ingen-config.h"
#include "OSCClientReceiver.hpp"
@@ -178,7 +179,10 @@ OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, i
int
OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
- _target->move((const char*)&argv[0]->s, (const char*)&argv[1]->s);
+ const char* old_path = &argv[1]->s;
+ const char* new_path = &argv[2]->s;
+
+ _target->move(old_path, new_path);
return 0;
}
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 49675ebc..f03edd94 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -20,9 +20,13 @@
#include <sigc++/sigc++.h>
-#include "ingen-config.h"
#include "raul/SharedPtr.hpp"
+#include "raul/Symbol.hpp"
+
#include "sord/sordmm.hpp"
+
+#include "ingen-config.h"
+
#ifdef HAVE_SLV2
#include "slv2/slv2.h"
#endif
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 9e2193e5..45af1d97 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -25,6 +25,7 @@
#include <lo/lo.h>
#include "raul/AtomLiblo.hpp"
+#include "raul/Path.hpp"
#include "raul/SharedPtr.hpp"
#include "raul/log.hpp"
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
index 2bf2665f..47d6f31d 100644
--- a/src/shared/ResourceImpl.hpp
+++ b/src/shared/ResourceImpl.hpp
@@ -18,9 +18,9 @@
#ifndef INGEN_SHARED_RESOURCEIMPL_HPP
#define INGEN_SHARED_RESOURCEIMPL_HPP
-#include <map>
#include "raul/URI.hpp"
#include "raul/SharedPtr.hpp"
+
#include "ingen/Resource.hpp"
#include "ingen/PortType.hpp"