summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-01 16:34:02 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 01:48:48 +0200
commit8a7cc98bd39e95fbdab7bbb8e3e6e4aa351c219b (patch)
tree8bd1158a4b0ae665e395b14832e3e504e7cf2f7d /src/server
parent6436ce26daefba37c7a612591a33b18365db69b7 (diff)
downloadingen-8a7cc98bd39e95fbdab7bbb8e3e6e4aa351c219b.tar.gz
ingen-8a7cc98bd39e95fbdab7bbb8e3e6e4aa351c219b.tar.bz2
ingen-8a7cc98bd39e95fbdab7bbb8e3e6e4aa351c219b.zip
Remove wrappers for standard memory functions
Diffstat (limited to 'src/server')
-rw-r--r--src/server/BlockImpl.cpp5
-rw-r--r--src/server/Engine.cpp3
-rw-r--r--src/server/EventWriter.cpp12
-rw-r--r--src/server/GraphImpl.cpp5
-rw-r--r--src/server/GraphImpl.hpp1
-rw-r--r--src/server/Worker.cpp4
-rw-r--r--src/server/events/Copy.cpp5
-rw-r--r--src/server/events/Delete.cpp5
-rw-r--r--src/server/ingen_lv2.cpp10
9 files changed, 36 insertions, 14 deletions
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index 06bd13c5..c14690b1 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -23,8 +23,8 @@
#include "RunContext.hpp"
#include "ThreadManager.hpp"
+#include "lv2/urid/urid.h"
#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
#include "raul/Symbol.hpp"
#include <cassert>
@@ -33,6 +33,9 @@
#include <string>
namespace ingen {
+
+class Resource;
+
namespace server {
BlockImpl::BlockImpl(PluginImpl* plugin,
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 8256981b..3ac253b7 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -58,6 +58,7 @@
#include <cstdint>
#include <cstdio>
#include <limits>
+#include <memory>
#include <thread>
#include <utility>
@@ -161,7 +162,7 @@ Engine::~Engine()
const SPtr<Store> store = this->store();
if (store) {
for (auto& s : *store.get()) {
- if (!dynamic_ptr_cast<NodeImpl>(s.second)->parent()) {
+ if (!std::dynamic_pointer_cast<NodeImpl>(s.second)->parent()) {
s.second.reset();
}
}
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index c7db23ee..9001b01a 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -17,7 +17,17 @@
#include "EventWriter.hpp"
#include "Engine.hpp"
-#include "events.hpp"
+
+#include "events/Connect.hpp"
+#include "events/Copy.hpp"
+#include "events/Delete.hpp"
+#include "events/Delta.hpp"
+#include "events/Disconnect.hpp"
+#include "events/DisconnectAll.hpp"
+#include "events/Get.hpp"
+#include "events/Mark.hpp"
+#include "events/Move.hpp"
+#include "events/Undo.hpp"
#include <boost/variant/apply_visitor.hpp>
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index 00d4cfd6..502b5465 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -34,6 +34,7 @@
#include <cassert>
#include <cstddef>
#include <map>
+#include <memory>
#include <unordered_map>
namespace ingen {
@@ -116,7 +117,7 @@ GraphImpl::duplicate(Engine& engine,
// Add duplicates of all arcs
for (const auto& a : _arcs) {
- SPtr<ArcImpl> arc = dynamic_ptr_cast<ArcImpl>(a.second);
+ SPtr<ArcImpl> arc = std::dynamic_pointer_cast<ArcImpl>(a.second);
if (arc) {
auto t = port_map.find(arc->tail());
auto h = port_map.find(arc->head());
@@ -287,7 +288,7 @@ GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port)
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
auto i = _arcs.find(std::make_pair(tail, dst_port));
if (i != _arcs.end()) {
- SPtr<ArcImpl> arc = dynamic_ptr_cast<ArcImpl>(i->second);
+ SPtr<ArcImpl> arc = std::dynamic_pointer_cast<ArcImpl>(i->second);
_arcs.erase(i);
return arc;
} else {
diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp
index 3e3c6159..04e3ea99 100644
--- a/src/server/GraphImpl.hpp
+++ b/src/server/GraphImpl.hpp
@@ -22,6 +22,7 @@
#include "ThreadManager.hpp"
#include "ingen/types.hpp"
+#include "lv2/urid/urid.h"
#include <cassert>
#include <cstdint>
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index e0d198d7..8e6bcb26 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -21,11 +21,15 @@
#include "LV2Block.hpp"
#include "ingen/Log.hpp"
+#include "ingen/types.hpp"
#include "lv2/worker/worker.h"
#include <cstdlib>
namespace ingen {
+
+class World;
+
namespace server {
/// A message in the Worker::_requests ring
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 5418af4b..a49fa3e4 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -28,6 +28,7 @@
#include "ingen/World.hpp"
#include "raul/Path.hpp"
+#include <memory>
#include <mutex>
#include <string>
#include <utility>
@@ -63,7 +64,7 @@ Copy::pre_process(PreProcessContext& ctx)
}
// Ensure it is a block (ports are not supported for now)
- if (!(_old_block = dynamic_ptr_cast<BlockImpl>(i->second))) {
+ if (!(_old_block = std::dynamic_pointer_cast<BlockImpl>(i->second))) {
return Event::pre_process_done(Status::BAD_OBJECT_TYPE, old_path);
}
@@ -143,7 +144,7 @@ bool
Copy::engine_to_filesystem(PreProcessContext&)
{
// Ensure source is a graph
- SPtr<GraphImpl> graph = dynamic_ptr_cast<GraphImpl>(_old_block);
+ SPtr<GraphImpl> graph = std::dynamic_pointer_cast<GraphImpl>(_old_block);
if (!graph) {
return Event::pre_process_done(Status::BAD_OBJECT_TYPE, _msg.old_uri);
}
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index f5f2e272..e91ab5ef 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -36,6 +36,7 @@
#include <cassert>
#include <cstddef>
+#include <memory>
#include <mutex>
#include <string>
@@ -79,8 +80,8 @@ Delete::pre_process(PreProcessContext& ctx)
return Event::pre_process_done(Status::NOT_FOUND, _path);
}
- if (!(_block = dynamic_ptr_cast<BlockImpl>(iter->second))) {
- _port = dynamic_ptr_cast<DuplexPort>(iter->second);
+ if (!(_block = std::dynamic_pointer_cast<BlockImpl>(iter->second))) {
+ _port = std::dynamic_pointer_cast<DuplexPort>(iter->second);
}
if ((!_block && !_port) || (_port && !_engine.driver()->dynamic_ports())) {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index a33fd482..84ecf5ba 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -633,7 +633,7 @@ ingen_connect_port(LV2_Handle instance, uint32_t port, void* data)
auto* me = static_cast<IngenPlugin*>(instance);
server::Engine* engine = static_cast<server::Engine*>(me->world->engine().get());
- const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
+ const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
if (port < driver->ports().size()) {
driver->ports().at(port)->set_buffer(data);
} else {
@@ -645,8 +645,8 @@ static void
ingen_activate(LV2_Handle instance)
{
auto* me = static_cast<IngenPlugin*>(instance);
- SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine());
- const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
+ SPtr<server::Engine> engine = std::static_pointer_cast<server::Engine>(me->world->engine());
+ const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
engine->activate();
me->main = make_unique<std::thread>(ingen_lv2_main, engine, driver);
}
@@ -655,8 +655,8 @@ static void
ingen_run(LV2_Handle instance, uint32_t sample_count)
{
auto* me = static_cast<IngenPlugin*>(instance);
- SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine());
- const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
+ SPtr<server::Engine> engine = std::static_pointer_cast<server::Engine>(me->world->engine());
+ const SPtr<LV2Driver>& driver = std::static_pointer_cast<LV2Driver>(engine->driver());
server::ThreadManager::set_flag(ingen::server::THREAD_PROCESS);
server::ThreadManager::set_flag(ingen::server::THREAD_IS_REAL_TIME);