summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/ingenuity/ConnectWindow.cpp2
-rw-r--r--src/progs/ingenuity/PatchPortModule.h2
-rw-r--r--src/progs/ingenuity/ThreadedLoader.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp
index 6c5a98ab..4b46b47e 100644
--- a/src/progs/ingenuity/ConnectWindow.cpp
+++ b/src/progs/ingenuity/ConnectWindow.cpp
@@ -164,7 +164,7 @@ ConnectWindow::connect()
snprintf(port_str, 6, "%u", port);
const string cmd = string("ingen --port=").append(port_str);
- if (Process::launch(cmd)) {
+ if (Raul::Process::launch(cmd)) {
SharedPtr<ModelEngineInterface> engine(
new OSCModelEngineInterface(string("osc.udp://localhost:").append(port_str)));
diff --git a/src/progs/ingenuity/PatchPortModule.h b/src/progs/ingenuity/PatchPortModule.h
index 619b8ecf..e6f30bec 100644
--- a/src/progs/ingenuity/PatchPortModule.h
+++ b/src/progs/ingenuity/PatchPortModule.h
@@ -64,7 +64,7 @@ protected:
//virtual void on_double_click(GdkEventButton* ev) { show_control_window(); }
//virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); }
- void metadata_update(const string& key, const Atom& value);
+ void metadata_update(const string& key, const Raul::Atom& value);
SharedPtr<PortModel> m_port;
boost::shared_ptr<Port> m_patch_port; ///< Port on this 'anonymous' module
diff --git a/src/progs/ingenuity/ThreadedLoader.h b/src/progs/ingenuity/ThreadedLoader.h
index 82080c94..7d3e9168 100644
--- a/src/progs/ingenuity/ThreadedLoader.h
+++ b/src/progs/ingenuity/ThreadedLoader.h
@@ -50,7 +50,7 @@ namespace Ingenuity {
*
* \ingroup Ingenuity
*/
-class ThreadedLoader : public Slave
+class ThreadedLoader : public Raul::Slave
{
public:
ThreadedLoader(SharedPtr<ModelEngineInterface> engine);
@@ -84,7 +84,7 @@ private:
DeprecatedLoader _deprecated_loader;
Loader _loader;
Serializer _serializer;
- Mutex _mutex;
+ Raul::Mutex _mutex;
list<Closure> _events;
};