summaryrefslogtreecommitdiffstats
path: root/src/server/BufferFactory.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-11 03:35:17 +0000
committerDavid Robillard <d@drobilla.net>2013-01-11 03:35:17 +0000
commita90eec5c87af4dec9f8f45223cd228cb7ca674c6 (patch)
tree5363986923fc4ed2d025a975d0f890df9733269a /src/server/BufferFactory.hpp
parent8caefa2c374ecf3af9ea455ce24784d398254ddf (diff)
downloadingen-a90eec5c87af4dec9f8f45223cd228cb7ca674c6.tar.gz
ingen-a90eec5c87af4dec9f8f45223cd228cb7ca674c6.tar.bz2
ingen-a90eec5c87af4dec9f8f45223cd228cb7ca674c6.zip
Use C++11 atomics.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4916 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/BufferFactory.hpp')
-rw-r--r--src/server/BufferFactory.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 1fe3a91e..82180308 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -17,13 +17,13 @@
#ifndef INGEN_ENGINE_BUFFERFACTORY_HPP
#define INGEN_ENGINE_BUFFERFACTORY_HPP
+#include <atomic>
#include <map>
#undef nil
#include <glibmm/thread.h>
#include "raul/Atom.hpp"
-#include "raul/AtomicPtr.hpp"
#include "raul/RingBuffer.hpp"
#include "raul/SharedPtr.hpp"
#include "ingen/Forge.hpp"
@@ -69,7 +69,7 @@ private:
BufferRef create(LV2_URID type, uint32_t capacity=0);
- inline Raul::AtomicPtr<Buffer>& free_list(LV2_URID type) {
+ inline std::atomic<Buffer*>& free_list(LV2_URID type) {
if (type == _uris.atom_Float) {
return _free_control;
} else if (type == _uris.atom_Sound) {
@@ -83,10 +83,10 @@ private:
void free_list(Buffer* head);
- Raul::AtomicPtr<Buffer> _free_audio;
- Raul::AtomicPtr<Buffer> _free_control;
- Raul::AtomicPtr<Buffer> _free_sequence;
- Raul::AtomicPtr<Buffer> _free_object;
+ std::atomic<Buffer*> _free_audio;
+ std::atomic<Buffer*> _free_control;
+ std::atomic<Buffer*> _free_sequence;
+ std::atomic<Buffer*> _free_object;
Glib::Mutex _mutex;
Engine& _engine;