summaryrefslogtreecommitdiffstats
path: root/src/server/BufferFactory.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /src/server/BufferFactory.cpp
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz
ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2
ingen-629fb50716083c71146340de97eb8651679ca9fb.zip
Merge Ingen::Shared namespace into Ingen namespace and core libingen library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/BufferFactory.cpp')
-rw-r--r--src/server/BufferFactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index 2bcf8201..59da152f 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -14,7 +14,7 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
#include "raul/log.hpp"
#include "AudioBuffer.hpp"
@@ -27,7 +27,7 @@ namespace Server {
static const size_t EVENT_BYTES_PER_FRAME = 4; // FIXME
-BufferFactory::BufferFactory(Engine& engine, Shared::URIs& uris)
+BufferFactory::BufferFactory(Engine& engine, URIs& uris)
: _engine(engine)
, _uris(uris)
, _silent_buffer(NULL)
@@ -42,7 +42,7 @@ BufferFactory::~BufferFactory()
free_list(_free_object.get());
}
-Shared::Forge&
+Forge&
BufferFactory::forge()
{
return _engine.world()->forge();