Merge branch 'master' into niels/rendering

3 files changed, 9 insertions, 10 deletions

diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index e1150ac..64fa281 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -5,17 +5,17 @@
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Resource> res) {
+Sound::Sound(std::unique_ptr<Asset> res) {
 	dbg_trace();
 	this->load(std::move(res));
 }
 
 Sound::Sound(const char * src) {
 	dbg_trace();
-	this->load(std::make_unique<api::Resource>(src));
+	this->load(std::make_unique<Asset>(src));
 }
 
-void Sound::load(std::unique_ptr<api::Resource> res) {
+void Sound::load(std::unique_ptr<Asset> res) {
 	this->sample.load(res->canonical());
 }
 
diff --git a/src/crepe/facade/Sound.h b/src/crepe/facade/Sound.h
index 2f1c924..b11f871 100644
--- a/src/crepe/facade/Sound.h
+++ b/src/crepe/facade/Sound.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <soloud.h>
-#include <soloud_wav.h>
+#include <soloud/soloud.h>
+#include <soloud/soloud_wav.h>
 
 #include <memory>
 
-#include "api/Resource.h"
-#include "api/baseResource.h"
+#include "Asset.h"
 
 namespace crepe {
 
@@ -67,10 +66,10 @@ public:
 
 public:
 	Sound(const char * src);
-	Sound(std::unique_ptr<api::Resource> res);
+	Sound(std::unique_ptr<Asset> res);
 
 private:
-	void load(std::unique_ptr<api::Resource> res);
+	void load(std::unique_ptr<Asset> res);
 
 private:
 	SoLoud::Wav sample;
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index 090966d..d3123d2 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <soloud.h>
+#include <soloud/soloud.h>
 
 #include "Sound.h"