renamed sound to sound_file

include/asset/asset_loader.hpp

@@ -22,7 +22,7 @@ namespace gdw {
 
 		virtual std::shared_ptr<const asset> load_asset(const std::string& name) const = 0;
 
-		virtual std::string native_name(const std::string& name) const {
+		virtual std::string native_name(const std::string&) const {
 			return std::string();
 		}
 	};

include/audio/audio_collection.hpp

@@ -7,7 +7,7 @@
 
 #include <audio/music.hpp>
 #include <audio/music_manager.hpp>
-#include <audio/sound.hpp>
+#include <audio/sound_file.hpp>
 #include <audio/sound_manager.hpp>
 
 namespace gdw {

include/audio/sound.hpp → include/audio/sound_file.hpp

@@ -4,13 +4,13 @@
 #include <SDL_mixer.h>
 
 namespace gdw {
-	class sound {
+	class sound_file {
 	private:
 		Mix_Chunk* impl_;
 
 	public:
-		sound(const char* mem, int size);
-		~sound();
+		sound_file(const char* mem, int size);
+		~sound_file();
 
 		Mix_Chunk* get() const;
 	};

include/audio/sound_manager.hpp

 #ifndef __GDW_SOUND_MANAGER_HPP__
 #define __GDW_SOUND_MANAGER_HPP__
 
-#include <audio/sound.hpp>
+#include <audio/sound_file.hpp>
 #include <util/cached_resource_manager.hpp>
 
 namespace gdw{
@@ -9,13 +9,13 @@ namespace gdw{
 }
 
 namespace gdw {
-	using sound_ptr = std::shared_ptr<const sound>;
+	using sound_ptr = std::shared_ptr<const sound_file>;
 
-	class sound_manager: public cached_resource_manager<const sound, sound_manager> {
+	class sound_manager: public cached_resource_manager<const sound_file, sound_manager> {
 	private:
 		engine& engine_;
 
-		friend class cached_resource_manager<const sound, sound_manager>;
+		friend class cached_resource_manager<const sound_file, sound_manager>;
 
 	public:
 		sound_manager(engine& engine);

src/audio/sound.cpp → src/audio/sound_file.cpp

 #include <audio/audio_helper.hpp>
-#include <audio/sound.hpp>
+#include <audio/sound_file.hpp>
 
 namespace gdw {
-	sound::sound(const char* mem, int size) {
+	sound_file::sound_file(const char* mem, int size) {
 		SDL_RWops* raw = SDL_RWFromConstMem((void*)mem, size);
 		if (raw == nullptr) {
 			audio_error("could not load music from memory");
@@ -10,13 +10,13 @@ namespace gdw {
 		impl_ = Mix_LoadWAV_RW(raw, 1);
 	}
 
-	sound::~sound() {
+	sound_file::~sound_file() {
 		if (impl_ != nullptr) {
 			Mix_FreeChunk(impl_);
 		}
 	}
 
-	Mix_Chunk* sound::get() const {
+	Mix_Chunk*sound_file::get() const {
 		return impl_;
 	}
 }

src/audio/sound_manager.cpp

@@ -13,6 +13,6 @@ namespace gdw {
 			return sound_ptr();
 		}
 		auto& content = asset->content();
-		return std::make_shared<const sound>(content.data(), content.size());
+		return std::make_shared<const sound_file>(content.data(), content.size());
 	}
 }