summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/AudioBuffer.hpp2
-rw-r--r--src/server/BufferFactory.cpp2
-rw-r--r--src/server/ClientBroadcaster.hpp2
-rw-r--r--src/server/ConnectionImpl.cpp11
-rw-r--r--src/server/ConnectionImpl.hpp2
-rw-r--r--src/server/InputPort.cpp5
-rw-r--r--src/server/LV2Info.cpp2
-rw-r--r--src/server/LV2RequestRunFeature.hpp3
-rw-r--r--src/server/LV2ResizeFeature.hpp3
-rw-r--r--src/server/ingen_lv2.cpp8
-rw-r--r--src/server/mix.hpp2
11 files changed, 14 insertions, 28 deletions
diff --git a/src/server/AudioBuffer.hpp b/src/server/AudioBuffer.hpp
index 1a3cf312..087c799f 100644
--- a/src/server/AudioBuffer.hpp
+++ b/src/server/AudioBuffer.hpp
@@ -30,8 +30,6 @@
#include "Context.hpp"
#include "types.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index 73b6558d..fcbf1189 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -113,7 +113,7 @@ BufferFactory::get(LV2_URID type, uint32_t capacity, bool force_create)
return create(type, capacity);
} else {
assert(false);
- error << "Failed to obtain buffer" << endl;
+ Raul::error << "Failed to obtain buffer" << std::endl;
return BufferRef();
}
}
diff --git a/src/server/ClientBroadcaster.hpp b/src/server/ClientBroadcaster.hpp
index 31e59162..3e9b7d0f 100644
--- a/src/server/ClientBroadcaster.hpp
+++ b/src/server/ClientBroadcaster.hpp
@@ -29,8 +29,6 @@
#include "NodeFactory.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 2b6a0255..b53f00fe 100644
--- a/src/server/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -61,10 +61,11 @@ ConnectionImpl::ConnectionImpl(PortImpl* src_port, PortImpl* dst_port)
void
ConnectionImpl::dump() const
{
- debug << _src_port->path() << " -> " << _dst_port->path()
- << (must_mix() ? " (MIX) " : " (DIRECT) ")
- << (must_queue() ? " (QUEUE)" : " (NOQUEUE) ")
- << "POLY: " << _src_port->poly() << " => " << _dst_port->poly() << endl;
+ Raul::debug << _src_port->path() << " -> " << _dst_port->path()
+ << (must_mix() ? " (MIX) " : " (DIRECT) ")
+ << (must_queue() ? " (QUEUE)" : " (NOQUEUE) ")
+ << "POLY: " << _src_port->poly() << " => " << _dst_port->poly()
+ << std::endl;
}
const Raul::Path&
@@ -115,7 +116,7 @@ ConnectionImpl::queue(Context& context)
boost::intrusive_ptr<Buffer> src_buf = _src_port->buffer(0);
if (src_buf->atom()->type != uris.atom_Sequence) {
- error << "Queued connection but source is not a Sequence" << endl;
+ Raul::error << "Queued connection but source is not a Sequence" << std::endl;
return;
}
diff --git a/src/server/ConnectionImpl.hpp b/src/server/ConnectionImpl.hpp
index 4d915606..3dc794db 100644
--- a/src/server/ConnectionImpl.hpp
+++ b/src/server/ConnectionImpl.hpp
@@ -31,8 +31,6 @@
#include "BufferFactory.hpp"
#include "Context.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 3fadd312..30745161 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -63,7 +63,7 @@ InputPort::InputPort(BufferFactory& bufs,
}
bool
-InputPort::apply_poly(Maid& maid, uint32_t poly)
+InputPort::apply_poly(Raul::Maid& maid, uint32_t poly)
{
bool ret = PortImpl::apply_poly(maid, poly);
if (!ret)
@@ -150,7 +150,8 @@ InputPort::remove_connection(ProcessContext& context, const OutputPort* src_port
}
if (!connection) {
- error << "[InputPort::remove_connection] Connection not found!" << endl;
+ Raul::error << "[InputPort::remove_connection] Connection not found!"
+ << std::endl;
return NULL;
}
diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp
index eebc1813..9180b421 100644
--- a/src/server/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -28,8 +28,6 @@
#include "LV2RequestRunFeature.hpp"
#include "LV2ResizeFeature.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/LV2RequestRunFeature.hpp b/src/server/LV2RequestRunFeature.hpp
index 180dfa9d..b15100d2 100644
--- a/src/server/LV2RequestRunFeature.hpp
+++ b/src/server/LV2RequestRunFeature.hpp
@@ -29,9 +29,6 @@
#include "NodeImpl.hpp"
#include "PortImpl.hpp"
-using namespace std;
-using namespace Raul;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index e560bf13..915c7442 100644
--- a/src/server/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -23,9 +23,6 @@
#include "NodeImpl.hpp"
#include "PortImpl.hpp"
-using namespace std;
-using namespace Raul;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 4b25c24c..dace8087 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -355,7 +355,7 @@ find_patches(const Glib::ustring& manifest_uri)
new LV2Patch(patch_uri, (const char*)file_path)));
free(file_path);
} else {
- Raul::error << "[Ingen] Patch has no rdfs:seeAlso" << endl;
+ Raul::error << "[Ingen] Patch has no rdfs:seeAlso" << std::endl;
}
}
@@ -543,7 +543,7 @@ ingen_save(LV2_Handle instance,
get_state_features(features, &map_path, &make_path);
if (!map_path || !make_path || !plugin->map) {
Raul::error << "Missing state:mapPath, state:makePath, or urid:Map."
- << endl;
+ << std::endl;
return LV2_STATE_ERR_NO_FEATURE;
}
@@ -581,7 +581,7 @@ ingen_restore(LV2_Handle instance,
LV2_State_Map_Path* map_path = NULL;
get_state_features(features, &map_path, NULL);
if (!map_path) {
- Raul::error << "Missing state:mapPath" << endl;
+ Raul::error << "Missing state:mapPath" << std::endl;
return LV2_STATE_ERR_NO_FEATURE;
}
@@ -595,7 +595,7 @@ ingen_restore(LV2_Handle instance,
&size, &type, &valflags);
if (!path) {
- Raul::error << "Failed to restore ingen:file" << endl;
+ Raul::error << "Failed to restore ingen:file" << std::endl;
return LV2_STATE_ERR_NO_PROPERTY;
}
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index 8bd1e5ba..75214093 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -25,8 +25,6 @@
#include "Buffer.hpp"
#include "Context.hpp"
-using namespace Raul;
-
namespace Ingen {
namespace Server {
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-20 20:26:09 +0000