From b99e38badb82c5cc79771a77c5f6ea180c67ee4f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 5 Oct 2024 14:24:39 +0200
Subject: move Asset from crepe::api to crepe

---
 src/crepe/Asset.cpp          | 14 ++++++++++++++
 src/crepe/Asset.h            | 24 ++++++++++++++++++++++++
 src/crepe/CMakeLists.txt     |  2 ++
 src/crepe/Sound.cpp          |  6 +++---
 src/crepe/Sound.h            |  6 +++---
 src/crepe/api/Asset.cpp      | 14 --------------
 src/crepe/api/Asset.h        | 24 ------------------------
 src/crepe/api/CMakeLists.txt |  2 --
 8 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 src/crepe/Asset.cpp
 create mode 100644 src/crepe/Asset.h
 delete mode 100644 src/crepe/api/Asset.cpp
 delete mode 100644 src/crepe/api/Asset.h

(limited to 'src')

diff --git a/src/crepe/Asset.cpp b/src/crepe/Asset.cpp
new file mode 100644
index 0000000..15ddc27
--- /dev/null
+++ b/src/crepe/Asset.cpp
@@ -0,0 +1,14 @@
+#include <filesystem>
+
+#include "Asset.h"
+
+using namespace crepe;
+
+Asset::Asset(const std::string & src) {
+	this->src = std::filesystem::canonical(src);
+	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
+}
+
+const std::istream & Asset::read() { return this->file; }
+
+const char * Asset::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/Asset.h b/src/crepe/Asset.h
new file mode 100644
index 0000000..736ba44
--- /dev/null
+++ b/src/crepe/Asset.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
+namespace crepe {
+
+class Asset {
+public:
+	Asset(const std::string & src);
+
+public:
+	//! Get an input stream to the contents of this resource
+	const std::istream & read();
+	//! Get the canonical path to this resource
+	const char * canonical();
+
+private:
+	std::string src;
+	std::ifstream file;
+};
+
+} // namespace crepe
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 3a60840..208ba1f 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(crepe PUBLIC
+	Asset.cpp
 	Sound.cpp
 	SoundContext.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
+	Asset.h
 	Sound.h
 	SoundContext.h
 )
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
index c6e87d5..73ad69c 100644
--- a/src/crepe/Sound.cpp
+++ b/src/crepe/Sound.cpp
@@ -5,17 +5,17 @@
 
 using namespace crepe;
 
-Sound::Sound(std::unique_ptr<api::Asset> 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::Asset>(src));
+	this->load(std::make_unique<Asset>(src));
 }
 
-void Sound::load(std::unique_ptr<api::Asset> res) {
+void Sound::load(std::unique_ptr<Asset> res) {
 	this->sample.load(res->canonical());
 }
 
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
index 339dd7c..1ac20a7 100644
--- a/src/crepe/Sound.h
+++ b/src/crepe/Sound.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "api/Asset.h"
+#include "Asset.h"
 
 namespace crepe {
 
@@ -66,10 +66,10 @@ public:
 
 public:
 	Sound(const char * src);
-	Sound(std::unique_ptr<api::Asset> res);
+	Sound(std::unique_ptr<Asset> res);
 
 private:
-	void load(std::unique_ptr<api::Asset> res);
+	void load(std::unique_ptr<Asset> res);
 
 private:
 	SoLoud::Wav sample;
diff --git a/src/crepe/api/Asset.cpp b/src/crepe/api/Asset.cpp
deleted file mode 100644
index 92ee50e..0000000
--- a/src/crepe/api/Asset.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <filesystem>
-
-#include "Asset.h"
-
-using namespace crepe::api;
-
-Asset::Asset(const std::string & src) {
-	this->src = std::filesystem::canonical(src);
-	this->file = std::ifstream(this->src, std::ios::in | std::ios::binary);
-}
-
-const std::istream & Asset::read() { return this->file; }
-
-const char * Asset::canonical() { return this->src.c_str(); }
diff --git a/src/crepe/api/Asset.h b/src/crepe/api/Asset.h
deleted file mode 100644
index 259c696..0000000
--- a/src/crepe/api/Asset.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <fstream>
-#include <iostream>
-#include <string>
-
-namespace crepe::api {
-
-class Asset {
-public:
-	Asset(const std::string & src);
-
-public:
-	//! Get an input stream to the contents of this resource
-	const std::istream & read();
-	//! Get the canonical path to this resource
-	const char * canonical();
-
-private:
-	std::string src;
-	std::ifstream file;
-};
-
-} // namespace crepe::api
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 54c7fdc..9548594 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,11 +1,9 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
-	Asset.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	AudioSource.h
 	Component.h
-	Asset.h
 )
 
-- 
cgit v1.2.3