diff options
author | David Robillard <d@drobilla.net> | 2011-04-18 12:47:15 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-18 12:47:15 +0000 |
commit | 8ba6bb943889bfdd58cf4a971a152041c1199cfe (patch) | |
tree | 91fbe8577e6d01070aa81f532ddd8102db1476f5 /src/engine/BufferFactory.hpp | |
parent | 3cd3bfe5079f84fafb7dc217f5393d6ba947109c (diff) | |
download | ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.gz ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.bz2 ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.zip |
Put engine code in new Ingen::Engine namespace.
Put core interfaces in Ingen namespace (not Ingen::Shared).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3159 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/BufferFactory.hpp')
-rw-r--r-- | src/engine/BufferFactory.hpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/engine/BufferFactory.hpp b/src/engine/BufferFactory.hpp index 8a2c9207..5d6ebf7c 100644 --- a/src/engine/BufferFactory.hpp +++ b/src/engine/BufferFactory.hpp @@ -28,16 +28,18 @@ namespace Ingen { -using namespace Shared; +namespace Shared { class LV2URIMap; } + +namespace Engine { class Engine; class Buffer; -namespace Shared { class LV2URIMap; } - class BufferFactory { public: - BufferFactory(Engine& engine, SharedPtr<Shared::LV2URIMap> uris); + BufferFactory(Engine& engine, + SharedPtr<Ingen::Shared::LV2URIMap> uris); + ~BufferFactory(); typedef boost::intrusive_ptr<Buffer> Ref; @@ -45,21 +47,21 @@ public: static size_t audio_buffer_size(SampleCount nframes); size_t default_buffer_size(PortType type); - Ref get(Shared::PortType type, size_t size=0, bool force_create=false); + Ref get(PortType type, size_t size=0, bool force_create=false); Ref silent_buffer() { return _silent_buffer; } void set_block_length(SampleCount block_length); - Shared::LV2URIMap& uris() { assert(_uris); return *_uris.get(); } + Ingen::Shared::LV2URIMap& uris() { assert(_uris); return *_uris.get(); } private: friend class Buffer; void recycle(Buffer* buf); - Ref create(Shared::PortType type, size_t size=0); + Ref create(PortType type, size_t size=0); - inline Raul::AtomicPtr<Buffer>& free_list(Shared::PortType type) { + inline Raul::AtomicPtr<Buffer>& free_list(PortType type) { switch (type.symbol()) { case PortType::AUDIO: return _free_audio; case PortType::CONTROL: return _free_control; @@ -77,13 +79,14 @@ private: Raul::AtomicPtr<Buffer> _free_event; Raul::AtomicPtr<Buffer> _free_object; - Glib::Mutex _mutex; - Engine& _engine; - SharedPtr<Shared::LV2URIMap> _uris; + Glib::Mutex _mutex; + Engine& _engine; + SharedPtr<Ingen::Shared::LV2URIMap> _uris; Ref _silent_buffer; }; +} // namespace Engine } // namespace Ingen #endif // INGEN_ENGINE_BUFFERFACTORY_HPP |