summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/BlockFactory.cpp2
-rw-r--r--src/server/BlockImpl.cpp2
-rw-r--r--src/server/ControlBindings.cpp2
-rw-r--r--src/server/DuplexPort.cpp2
-rw-r--r--src/server/Engine.cpp2
-rw-r--r--src/server/EventWriter.cpp2
-rw-r--r--src/server/GraphImpl.cpp8
-rw-r--r--src/server/InputPort.cpp2
-rw-r--r--src/server/InternalPlugin.cpp2
-rw-r--r--src/server/JackDriver.cpp12
-rw-r--r--src/server/LV2Block.cpp8
-rw-r--r--src/server/LV2Plugin.cpp6
-rw-r--r--src/server/NodeImpl.cpp2
-rw-r--r--src/server/PortAudioDriver.cpp2
-rw-r--r--src/server/PortImpl.cpp2
-rw-r--r--src/server/PostProcessor.cpp2
-rw-r--r--src/server/PreProcessor.cpp2
-rw-r--r--src/server/ingen_jack.cpp1
-rw-r--r--src/server/ingen_portaudio.cpp1
-rw-r--r--src/server/internals/Controller.cpp2
-rw-r--r--src/server/internals/Note.cpp2
-rw-r--r--src/server/internals/Trigger.cpp2
22 files changed, 14 insertions, 54 deletions
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp
index 62912a21..1cae6f58 100644
--- a/src/server/BlockFactory.cpp
+++ b/src/server/BlockFactory.cpp
@@ -32,8 +32,6 @@
#include "LV2Plugin.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index 96ae0795..e2c202a8 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -28,8 +28,6 @@
#include "RunContext.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 454d2be1..7feed87e 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -30,8 +30,6 @@
#include "RunContext.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 371ee5f4..a9076239 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -22,8 +22,6 @@
#include "Engine.hpp"
#include "GraphImpl.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 1884e25d..628d0b50 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -58,8 +58,6 @@
#include "SocketListener.hpp"
#endif
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index b8a32fcd..ebdf7562 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -22,8 +22,6 @@
#include "EventWriter.hpp"
#include "events.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index bf1c99bf..ec73a8c8 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -32,8 +32,6 @@
#include "PortImpl.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
@@ -272,14 +270,14 @@ void
GraphImpl::add_arc(SPtr<ArcImpl> a)
{
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
- _arcs.insert(make_pair(make_pair(a->tail(), a->head()), a));
+ _arcs.emplace(std::make_pair(a->tail(), a->head()), a);
}
SPtr<ArcImpl>
GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port)
{
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
- Arcs::iterator i = _arcs.find(make_pair(tail, dst_port));
+ Arcs::iterator i = _arcs.find(std::make_pair(tail, dst_port));
if (i != _arcs.end()) {
SPtr<ArcImpl> arc = dynamic_ptr_cast<ArcImpl>(i->second);
_arcs.erase(i);
@@ -293,7 +291,7 @@ bool
GraphImpl::has_arc(const PortImpl* tail, const PortImpl* dst_port) const
{
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
- Arcs::const_iterator i = _arcs.find(make_pair(tail, dst_port));
+ Arcs::const_iterator i = _arcs.find(std::make_pair(tail, dst_port));
return (i != _arcs.end());
}
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 2baa8ff7..2f22491f 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -30,8 +30,6 @@
#include "RunContext.hpp"
#include "mix.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index c81d7563..17f6fc70 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -24,8 +24,6 @@
#include "Engine.hpp"
#include "InternalPlugin.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index a4ae8e7b..433ca758 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -46,8 +46,6 @@
#include "ThreadManager.hpp"
#include "util.hpp"
-using namespace std;
-
typedef jack_default_audio_sample_t jack_sample_t;
namespace Ingen {
@@ -539,16 +537,18 @@ JackDriver::_session_cb(jack_session_event_t* event)
{
_engine.log().info(fmt("Jack session save to %1%\n") % event->session_dir);
- const string cmd = (boost::format("ingen -eg -n %1% -u %2% -l ${SESSION_DIR}")
- % jack_get_client_name(_client)
- % event->client_uuid).str();
+ const std::string cmd = (
+ boost::format("ingen -eg -n %1% -u %2% -l ${SESSION_DIR}")
+ % jack_get_client_name(_client)
+ % event->client_uuid).str();
SPtr<Serialiser> serialiser = _engine.world()->serialiser();
if (serialiser) {
std::lock_guard<std::mutex> lock(_engine.world()->rdf_mutex());
SPtr<Node> root(_engine.root_graph(), NullDeleter<Node>);
- serialiser->write_bundle(root, string("file://") + event->session_dir);
+ serialiser->write_bundle(root,
+ std::string("file://") + event->session_dir);
}
event->command_line = (char*)malloc(cmd.size() + 1);
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 05b76737..56ef97a1 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -46,8 +46,6 @@
#include "RunContext.hpp"
#include "Worker.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
@@ -367,7 +365,7 @@ LV2Block::instantiate(BufferFactory& bufs, const LilvState* state)
if (!val.type() && (port_type != PortType::ATOM)) {
// Ensure numeric ports have a value, use 0 by default
- val = forge.make(isnan(def_values[j]) ? 0.0f : def_values[j]);
+ val = forge.make(std::isnan(def_values[j]) ? 0.0f : def_values[j]);
}
PortImpl* port = (direction == INPUT)
@@ -382,10 +380,10 @@ LV2Block::instantiate(BufferFactory& bufs, const LilvState* state)
if (direction == INPUT && (port_type == PortType::CONTROL
|| port_type == PortType::CV)) {
port->set_value(val);
- if (!isnan(min_values[j])) {
+ if (!std::isnan(min_values[j])) {
port->set_minimum(forge.make(min_values[j]));
}
- if (!isnan(max_values[j])) {
+ if (!std::isnan(max_values[j])) {
port->set_maximum(forge.make(max_values[j]));
}
}
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 4a4fd674..529e0e4e 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -25,8 +25,6 @@
#include "LV2Block.hpp"
#include "LV2Plugin.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
@@ -68,14 +66,14 @@ LV2Plugin::update_properties()
const Raul::Symbol
LV2Plugin::symbol() const
{
- string working = uri();
+ std::string working = uri();
if (working.back() == '/') {
working = working.substr(0, working.length() - 1);
}
while (working.length() > 0) {
size_t last_slash = working.find_last_of("/");
- const string symbol = working.substr(last_slash+1);
+ const std::string symbol = working.substr(last_slash+1);
if ( (symbol[0] >= 'a' && symbol[0] <= 'z')
|| (symbol[0] >= 'A' && symbol[0] <= 'Z') ) {
return Raul::Symbol::symbolify(symbol);
diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp
index 4a027558..852dfd63 100644
--- a/src/server/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -18,8 +18,6 @@
#include "NodeImpl.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp
index a97f5105..17b5c8cf 100644
--- a/src/server/PortAudioDriver.cpp
+++ b/src/server/PortAudioDriver.cpp
@@ -38,8 +38,6 @@
#include "ThreadManager.hpp"
#include "util.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index e8486645..c5057e87 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -27,8 +27,6 @@
#include "PortType.hpp"
#include "ThreadManager.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp
index 90dd0309..f0a58b18 100644
--- a/src/server/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -21,8 +21,6 @@
#include "PostProcessor.hpp"
#include "RunContext.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp
index 6beccd7c..28daa1dd 100644
--- a/src/server/PreProcessor.cpp
+++ b/src/server/PreProcessor.cpp
@@ -29,8 +29,6 @@
#include "ThreadManager.hpp"
#include "UndoStack.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp
index 38326c20..a897f130 100644
--- a/src/server/ingen_jack.cpp
+++ b/src/server/ingen_jack.cpp
@@ -26,7 +26,6 @@
#include "JackDriver.hpp"
#include "Engine.hpp"
-using namespace std;
using namespace Ingen;
struct IngenJackModule : public Ingen::Module {
diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp
index 92ccaa15..e4065342 100644
--- a/src/server/ingen_portaudio.cpp
+++ b/src/server/ingen_portaudio.cpp
@@ -26,7 +26,6 @@
#include "PortAudioDriver.hpp"
#include "Engine.hpp"
-using namespace std;
using namespace Ingen;
struct IngenPortAudioModule : public Ingen::Module {
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 36c735ce..9f20ee27 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -30,8 +30,6 @@
#include "RunContext.hpp"
#include "util.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
namespace Internals {
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index dc282417..b3688dfd 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -34,8 +34,6 @@
// #define NOTE_DEBUG 1
-using namespace std;
-
namespace Ingen {
namespace Server {
namespace Internals {
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 88bfd3f1..8adf211c 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -30,8 +30,6 @@
#include "internals/Trigger.hpp"
#include "util.hpp"
-using namespace std;
-
namespace Ingen {
namespace Server {
namespace Internals {
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 15:21:47 +0000