From a6521b43d3919014a2481761563089191b96303a Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Mon, 1 Jun 2015 17:41:10 +0100
Subject: [PATCH 1/8] Add SoLoud dependence to GameEngine vcxproj

Debug and release DLLs.
---
 GameEngine/GameEngine/GameEngine.vcxproj | 32 +++++++++---------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/GameEngine/GameEngine/GameEngine.vcxproj b/GameEngine/GameEngine/GameEngine.vcxproj
index 3c4f3243f..64e30a968 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj
+++ b/GameEngine/GameEngine/GameEngine.vcxproj
@@ -103,7 +103,7 @@
       </OpenMPSupport>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Vendors/SoLoud/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>
       </RuntimeTypeInfo>
       <DisableSpecificWarnings>4503;4099</DisableSpecificWarnings>
@@ -119,10 +119,8 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
     </ProjectReference>
     <Lib>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>soloud_x64_d.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)Vendors/SoLoud/debug</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006,4221,4099,4098,4075 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
@@ -133,7 +131,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;EDITOR_ENABLED;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;AGE_ENABLE_IMGUI;AGE_ENABLE_PROFILING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Vendors/SoLoud/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4503;4099</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>false</TreatWarningAsError>
@@ -147,10 +145,8 @@
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32.lib;glext.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>soloud_x64.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)Vendors/SoLoud/release</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
@@ -171,7 +167,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;EDITOR_ENABLED;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Vendors/SoLoud/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4503;4099</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>false</TreatWarningAsError>
@@ -185,10 +181,8 @@
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32.lib;glext.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>soloud_x64.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)Vendors/SoLoud/release</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006,4221,4099,4098,4075 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
     <ProjectReference>
@@ -210,7 +204,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;EDITOR_ENABLED;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;AGE_ENABLE_PROFILING = 1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Vendors/SoLoud/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4503;4099</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>false</TreatWarningAsError>
@@ -224,10 +218,8 @@
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32.lib;glext.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>soloud_x64.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)Vendors/SoLoud/release</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>

From 36372e3dda5fa21bd895f5692fc241ba2f9882ca Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Tue, 2 Jun 2015 17:13:54 +0100
Subject: [PATCH 2/8] Remove FMOD references

from the Audio code
---
 GameEngine/GameEngine/Engine/Audio/Audio.cpp  | 61 --------------
 GameEngine/GameEngine/Engine/Audio/Audio.hh   | 42 ----------
 .../GameEngine/Engine/Audio/AudioManager.cpp  | 79 +------------------
 .../GameEngine/Engine/Audio/AudioManager.hh   | 10 +--
 .../GameEngine/Engine/Audio/FmodError.cpp     | 11 ---
 .../GameEngine/Engine/Audio/FmodError.hpp     |  6 --
 GameEngine/GameEngine/GameEngine.vcxproj      |  4 -
 .../GameEngine/GameEngine.vcxproj.filters     |  4 -
 8 files changed, 8 insertions(+), 209 deletions(-)
 delete mode 100644 GameEngine/GameEngine/Engine/Audio/Audio.cpp
 delete mode 100644 GameEngine/GameEngine/Engine/Audio/Audio.hh
 delete mode 100644 GameEngine/GameEngine/Engine/Audio/FmodError.cpp
 delete mode 100644 GameEngine/GameEngine/Engine/Audio/FmodError.hpp

diff --git a/GameEngine/GameEngine/Engine/Audio/Audio.cpp b/GameEngine/GameEngine/Engine/Audio/Audio.cpp
deleted file mode 100644
index 2d8c3707e..000000000
--- a/GameEngine/GameEngine/Engine/Audio/Audio.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <Audio/Audio.hh>
-#include <Audio/AudioManager.hh>
-
-Audio::Audio(std::shared_ptr<AudioManager> manager, const OldFile &file, AudioType type, const std::string &name)
-: _manager(manager)
-, _file(file)
-, _name(name.empty() ? file.getShortFileName() : name)
-, _audio(nullptr)
-, _audioType(type)
-{
-	assert(type != AUDIO_TYPE_UNDEFINED && "Audio type is undefined");
-	assert(manager != nullptr && "Audio manager is null");
-}
-
-Audio::~Audio()
-{
-	if (!_audio)
-		return;
-	_audio->release();
-}
-
-bool Audio::load(AudioSpatialType type)
-{
-	if (_audio)
-		return true;
-	FMOD::Sound *audio = nullptr;
-	if (_audioType == AUDIO_SOUND)
-	{
-		_manager->getSystem()->createSound(_file.getFullName().c_str(), type, 0, &audio);
-	}
-	else if (_audioType == AUDIO_STREAM)
-	{
-		_manager->getSystem()->createStream(_file.getFullName().c_str(), type, 0, &audio);
-	}
-	if (audio == nullptr)
-	{
-		std::cerr << "FMOD failed to load audio." << std::endl;
-		return false;
-	}
-	_audio = std::shared_ptr<FMOD::Sound>(audio);
-	return true;
-}
-
-const OldFile &Audio::getPath() const
-{
-	return _file;
-}
-
-const std::string &Audio::getName() const
-{
-	return _name;
-}
-
-FMOD::Channel *Audio::play(ChannelGroupType channelGroup, bool now)
-{
-	FMOD::Channel *channel = nullptr;
-	_manager->getSystem()->playSound(FMOD_CHANNEL_FREE, _audio.get(), true, &channel);
-	channel->setChannelGroup(_manager->getChannelGroup(channelGroup));
-	channel->setPaused(!now);
-	return channel;
-}
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/Audio.hh b/GameEngine/GameEngine/Engine/Audio/Audio.hh
deleted file mode 100644
index f6cde9b14..000000000
--- a/GameEngine/GameEngine/Engine/Audio/Audio.hh
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <Utils/OldFile.hpp>
-#include <fmod.hpp>
-#include <memory>
-#include <cassert>
-#include <Audio/FmodError.hpp>
-#include <Audio/ChannelGroupType.hpp>
-
-class AudioManager;
-
-class Audio
-{
-public:
-	enum AudioType
-	{
-		AUDIO_TYPE_UNDEFINED = 0
-		, AUDIO_SOUND = 1
-		, AUDIO_STREAM = 2
-	};
-
-	enum AudioSpatialType
-	{
-		AUDIO_SPACE_UNDEFINED = 0
-		, AUDIO_2D = FMOD_2D
-		, AUDIO_3D = FMOD_3D
-	};
-
-public:
-	Audio(std::shared_ptr<AudioManager> manager, const OldFile &file, AudioType type, const std::string &name = "");
-	~Audio();
-	bool load(AudioSpatialType type);
-	FMOD::Channel *play(ChannelGroupType channelGroup, bool now);
-	const OldFile &getPath() const;
-	const std::string &getName() const;
-private:
-	std::shared_ptr<AudioManager> _manager;
-	OldFile _file;
-	const std::string _name;
-	std::shared_ptr<FMOD::Sound> _audio;
-	AudioType _audioType;
-};
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
index 742ea2fe5..4fe8ec565 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
@@ -3,11 +3,11 @@
 #include <iostream>
 
 AudioManager::AudioManager()
-: _system(nullptr)
 {}
 
 AudioManager::~AudioManager()
 {
+	/*
 	_audios.clear();
 	for (auto &&e : _channelGroups)
 	{
@@ -18,85 +18,14 @@ AudioManager::~AudioManager()
 	{
 		_system->close();
 		_system->release();
-	}
+	}*/
 }
 
 bool AudioManager::init()
 {
-	// FMOD IS ALREADY INTIALIZED
-	if (_system != nullptr)
-		return true;
-
-	// CREATE SYSTEM
-	if (!fmodError(FMOD::System_Create(&_system)))
-		return false;
-
-	// CHECK IF WE ARE USING THE SAME FMOD VERSION
-	unsigned int version;
-	if (!fmodError(_system->getVersion(&version)))
-		return false;
-	if (version != FMOD_VERSION)
-	{
-		std::cerr << "You are using an old version of FMOD : " << version << ". This program require version " << FMOD_VERSION << std::endl;
-		return false;
-	}
-
-	int driverNumber;
-	// GET THE NUMBER OF SOUND CARD
-	if (!fmodError(_system->getNumDrivers(&driverNumber)))
-		return false;
-	if (driverNumber == 0)
-	{
-		// IF NO SOUND CARD THEN DISABLE SOUND
-		if (fmodError(_system->setOutput(FMOD_OUTPUTTYPE_NOSOUND)))
-			return false;
-		return true;
-	}
-
-	// GET THE CAPABILITIES OF THE DEFAULT SOUND CARD
-	if (!fmodError(_system->getDriverCaps(0, &_caps, 0, &_speakerMode)))
-		return false;
-	if (!fmodError(_system->setSpeakerMode(_speakerMode)))
-		return false;
-
-	// CHECK IF HARDWARE ACCELERATED IS ENABLED
-	if (_caps & FMOD_CAPS_HARDWARE_EMULATED)
-	{
-		if (!fmodError(_system->setDSPBufferSize(1024, 10)))
-			return false;
-	}
-
-	// SUPPORT SIGMATEL DRIVERS
-	char name[256];
-	if (!fmodError(_system->getDriverInfo(0, name, 256, 0)))
-		return false;
-
-	if (std::strstr(name, "SigmaTel"))
-	{
-		if (!fmodError(_system->setSoftwareFormat(48000, FMOD_SOUND_FORMAT_PCMFLOAT, 0, 0, FMOD_DSP_RESAMPLER_LINEAR)))
-			return false;
-	}
-
-	// INITIALIZE SYSTEM
-	if (!fmodError(_system->init(1024, FMOD_INIT_NORMAL, 0)))
-		return false;
-
-	// create Music Channels
-
-	for (std::size_t i = CHANNEL_GROUP_MUSIC; i <= CHANNEL_GROUP_CUSTOM_6; ++i)
-	{
-		FMOD::ChannelGroup *c;
-		if (!fmodError(_system->createChannelGroup(NULL, &c)))
-			return false;
-		_channelGroups.insert(std::make_pair(static_cast<ChannelGroupType>(i), c));
-	}
-
-	// SET 1 3D listener
-	if (!fmodError(_system->set3DNumListeners(1)))
-		return false;
 	return true;
 }
-
+/*
 void AudioManager::update()
 {
 	_system->update();
@@ -142,4 +71,4 @@ FMOD::ChannelGroup *AudioManager::getChannelGroup(ChannelGroupType type)
 {
 	assert(_channelGroups.find(type) != std::end(_channelGroups) && "Channel goup not found.");
 	return _channelGroups[type];
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
index b77d064c6..ce42a09a8 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
@@ -1,13 +1,10 @@
 #pragma once
 
-#include <fmod.hpp>
-#include <Audio/FmodError.hpp>
 #include <Audio/ChannelGroupType.hpp>
 #include <Utils/Dependency.hpp>
 #include <memory>
 #include <map>
 #include <iostream>
-#include <Audio/Audio.hh>
 
 class AudioManager : public std::enable_shared_from_this<AudioManager>, public Dependency<AudioManager>
 {
@@ -16,15 +13,16 @@ public:
 	virtual ~AudioManager();
 	bool init();
 	void update();
-	std::shared_ptr<Audio> loadSound(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name = "");
+	/*std::shared_ptr<Audio> loadSound(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name = "");
 	std::shared_ptr<Audio> loadStream(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name = "");
 	FMOD::System *getSystem();
 	FMOD::ChannelGroup* getChannelGroup(ChannelGroupType type);
-	inline std::shared_ptr<Audio> getAudio(const std::string &name){ auto r = _audios.find(name); if (r == std::end(_audios)) return nullptr; return r->second; }
+	inline std::shared_ptr<Audio> getAudio(const std::string &name){ auto r = _audios.find(name); if (r == std::end(_audios)) return nullptr; return r->second; }*/
 private:
+	/*
 	FMOD::System *_system;
 	FMOD_SPEAKERMODE _speakerMode;
 	FMOD_CAPS _caps;
 	std::map<ChannelGroupType, FMOD::ChannelGroup*> _channelGroups;
-	std::map<std::string, std::shared_ptr<Audio>> _audios;
+	std::map<std::string, std::shared_ptr<Audio>> _audios;*/
 };
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/FmodError.cpp b/GameEngine/GameEngine/Engine/Audio/FmodError.cpp
deleted file mode 100644
index cbc134e8a..000000000
--- a/GameEngine/GameEngine/Engine/Audio/FmodError.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <Audio/FmodError.hpp>
-
-bool fmodError(FMOD_RESULT result)
-{
-	if (result != FMOD_OK)
-	{
-		std::cerr << "FMOD error : [" << result << "] :: " << FMOD_ErrorString(result) << std::endl;
-		return false;
-	}
-	return true;
-}
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/FmodError.hpp b/GameEngine/GameEngine/Engine/Audio/FmodError.hpp
deleted file mode 100644
index 6e701bebb..000000000
--- a/GameEngine/GameEngine/Engine/Audio/FmodError.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <fmod_errors.h>
-#include <iostream>
-
-bool fmodError(FMOD_RESULT result);
\ No newline at end of file
diff --git a/GameEngine/GameEngine/GameEngine.vcxproj b/GameEngine/GameEngine/GameEngine.vcxproj
index 64e30a968..d0217848b 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj
+++ b/GameEngine/GameEngine/GameEngine.vcxproj
@@ -377,9 +377,7 @@
     <ClCompile Include="Engine\Utils\Age_microprofile.cpp" />
     <ClCompile Include="Engine\Utils\BitOperations.cpp" />
     <ClCompile Include="Engine\Utils\BoundingInfos.cpp" />
-    <ClCompile Include="Engine\Audio\Audio.cpp" />
     <ClCompile Include="Engine\Audio\AudioManager.cpp" />
-    <ClCompile Include="Engine\Audio\FmodError.cpp" />
     <ClCompile Include="Engine\Components\CameraComponent.cpp" />
     <ClCompile Include="Engine\Components\Component.cpp" />
     <ClCompile Include="Engine\Components\ComponentRegistrationManager.cpp" />
@@ -681,8 +679,6 @@
     <ClInclude Include="Engine\Utils\DrawQuad.hh" />
     <ClInclude Include="Engine\Audio\AudioManager.hh" />
     <ClInclude Include="Engine\Audio\ChannelGroupType.hpp" />
-    <ClInclude Include="Engine\Audio\FmodError.hpp" />
-    <ClInclude Include="Engine\Audio\Audio.hh" />
     <ClInclude Include="Engine\Components\CameraComponent.hpp" />
     <ClInclude Include="Engine\Components\CameraComponentTemplates.hpp" />
     <ClInclude Include="Engine\Components\ComponentRegistrationManager.hpp" />
diff --git a/GameEngine/GameEngine/GameEngine.vcxproj.filters b/GameEngine/GameEngine/GameEngine.vcxproj.filters
index 956504aea..ecccfa583 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj.filters
+++ b/GameEngine/GameEngine/GameEngine.vcxproj.filters
@@ -104,9 +104,7 @@
     <ClCompile Include="Engine\Utils\AABoundingBox.cpp" />
     <ClCompile Include="Engine\Utils\BitOperations.cpp" />
     <ClCompile Include="Engine\Utils\BoundingInfos.cpp" />
-    <ClCompile Include="Engine\Audio\Audio.cpp" />
     <ClCompile Include="Engine\Audio\AudioManager.cpp" />
-    <ClCompile Include="Engine\Audio\FmodError.cpp" />
     <ClCompile Include="Engine\Components\CameraComponent.cpp" />
     <ClCompile Include="Engine\Components\Component.cpp" />
     <ClCompile Include="Engine\Components\ComponentRegistrationManager.cpp" />
@@ -405,8 +403,6 @@
     <ClInclude Include="Engine\Utils\DrawQuad.hh" />
     <ClInclude Include="Engine\Audio\AudioManager.hh" />
     <ClInclude Include="Engine\Audio\ChannelGroupType.hpp" />
-    <ClInclude Include="Engine\Audio\FmodError.hpp" />
-    <ClInclude Include="Engine\Audio\Audio.hh" />
     <ClInclude Include="Engine\Components\CameraComponent.hpp" />
     <ClInclude Include="Engine\Components\CameraComponentTemplates.hpp" />
     <ClInclude Include="Engine\Components\ComponentRegistrationManager.hpp" />

From 950523307fbc4d8f6a9aa0b4dffd89cbe98c7218 Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Tue, 2 Jun 2015 18:01:48 +0100
Subject: [PATCH 3/8] Remove FMOD dependence from the vcxproj

---
 GameEngine/EngineCoreTest/EngineCoreTest.vcxproj | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/GameEngine/EngineCoreTest/EngineCoreTest.vcxproj b/GameEngine/EngineCoreTest/EngineCoreTest.vcxproj
index 72c358401..c5b2e15b5 100644
--- a/GameEngine/EngineCoreTest/EngineCoreTest.vcxproj
+++ b/GameEngine/EngineCoreTest/EngineCoreTest.vcxproj
@@ -69,7 +69,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>$(SolutionDir)Vendors/OpenGL/include;$(SolutionDir)GameEngine/Engine;$(SolutionDir)GameEngine;$(ProjectDir);$(SolutionDir)Vendors;$(SolutionDir)Vendors/TinyObjLoader;$(IncludePath);$(SolutionDir)Vendors/boost_1_55_0;$(SolutionDir)Vendors\fmod\inc</IncludePath>
+    <IncludePath>$(SolutionDir)Vendors/OpenGL/include;$(SolutionDir)GameEngine/Engine;$(SolutionDir)GameEngine;$(ProjectDir);$(SolutionDir)Vendors;$(SolutionDir)Vendors/TinyObjLoader;$(IncludePath);$(SolutionDir)Vendors/boost_1_55_0</IncludePath>
     <LibraryPath>$(SolutionDir)Vendors/OpenGL/lib/x64;$(SolutionDir)Vendors\fmod\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
     <SourcePath>$(SolutionDir)/ResourcesForTests;</SourcePath>
   </PropertyGroup>
@@ -83,8 +83,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(SolutionDir)Vendors/OpenGL/lib/x64;$(SolutionDir)Vendors\fmod\lib;$(SolutionDir)Vendors/bullet\lib\x64Release;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir)Vendors/OpenGL/include;$(SolutionDir)GameEngine/Engine;$(SolutionDir)GameEngine;$(ProjectDir);$(SolutionDir)Vendors;$(SolutionDir)Vendors/TinyObjLoader;$(IncludePath);$(SolutionDir)Vendors/boost_1_55_0;$(SolutionDir)Vendors\bullet\src;$(SolutionDir)Vendors\fmod\inc</IncludePath>
+    <LibraryPath>$(SolutionDir)Vendors/OpenGL/lib/x64;$(SolutionDir)Vendors/bullet\lib\x64Release;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)Vendors/OpenGL/include;$(SolutionDir)GameEngine/Engine;$(SolutionDir)GameEngine;$(ProjectDir);$(SolutionDir)Vendors;$(SolutionDir)Vendors/TinyObjLoader;$(IncludePath);$(SolutionDir)Vendors/boost_1_55_0;$(SolutionDir)Vendors\bullet\src</IncludePath>
     <SourcePath>$(SolutionDir)/ResourcesForTests;</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
@@ -104,7 +104,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;minizip.lib;zlib.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;fmodex64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;minizip.lib;zlib.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
@@ -131,7 +131,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;fmodex64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>$(SolutionDir)Vendors\zlib\lib\windows\x64;$(SolutionDir)Vendors\minizip\lib\windows\x64;C:\Program Files (x86)\Visual Leak Detector\lib\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
@@ -156,7 +156,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;fmodex64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>$(SolutionDir)Vendors\zlib\lib\windows\x64;$(SolutionDir)Vendors\minizip\lib\windows\x64;C:\Program Files (x86)\Visual Leak Detector\lib\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
@@ -181,7 +181,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;fmodex64_vc.lib;BulletCollision.lib;BulletDynamics.lib;BulletFileLoader.lib;BulletWorldImporter.lib;BulletMultiThreaded.lib;ConvexDecomposition.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>minizip.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;BulletCollision.lib;BulletDynamics.lib;BulletFileLoader.lib;BulletWorldImporter.lib;BulletMultiThreaded.lib;ConvexDecomposition.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>$(SolutionDir)Vendors\zlib\lib\windows\x64;$(SolutionDir)Vendors\minizip\lib\windows\x64;C:\Program Files (x86)\Visual Leak Detector\lib\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>

From 065de9e3df3ca338011cb705f0041b6a7320c553 Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Thu, 4 Jun 2015 20:07:08 +0100
Subject: [PATCH 4/8] Add SoLoud initialization

First step for new simple SoundManager with SoLoud.
---
 GameEngine/GameEngine/Engine/Audio/AudioManager.cpp | 2 ++
 GameEngine/GameEngine/Engine/Audio/AudioManager.hh  | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
index 4fe8ec565..00c058cfd 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
@@ -7,6 +7,7 @@ AudioManager::AudioManager()
 
 AudioManager::~AudioManager()
 {
+	this->_soloud.deinit();
 	/*
 	_audios.clear();
 	for (auto &&e : _channelGroups)
@@ -23,6 +24,7 @@ AudioManager::~AudioManager()
 
 bool AudioManager::init()
 {
+	this->_soloud.init();
 	return true;
 }
 /*
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
index ce42a09a8..a44a42417 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <iostream>
+#include <soloud.h>
 
 class AudioManager : public std::enable_shared_from_this<AudioManager>, public Dependency<AudioManager>
 {
@@ -19,10 +20,8 @@ public:
 	FMOD::ChannelGroup* getChannelGroup(ChannelGroupType type);
 	inline std::shared_ptr<Audio> getAudio(const std::string &name){ auto r = _audios.find(name); if (r == std::end(_audios)) return nullptr; return r->second; }*/
 private:
+	SoLoud::Soloud soloud;
 	/*
-	FMOD::System *_system;
-	FMOD_SPEAKERMODE _speakerMode;
-	FMOD_CAPS _caps;
 	std::map<ChannelGroupType, FMOD::ChannelGroup*> _channelGroups;
 	std::map<std::string, std::shared_ptr<Audio>> _audios;*/
 };
\ No newline at end of file

From 9824aefe67aef770a450cf2f8570c8917f02d4fc Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Thu, 4 Jun 2015 20:07:08 +0100
Subject: [PATCH 5/8] Remove FMOD dependence from the GameEngine project.

---
 GameEngine/GameEngine/GameEngine.vcxproj         | 2 ++
 GameEngine/GameEngine/GameEngine.vcxproj.filters | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/GameEngine/GameEngine/GameEngine.vcxproj b/GameEngine/GameEngine/GameEngine.vcxproj
index d0217848b..217a012de 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj
+++ b/GameEngine/GameEngine/GameEngine.vcxproj
@@ -235,6 +235,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Vendors\imgui\imgui.cpp" />
+    <ClCompile Include="Audio.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlock.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManager.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManagerFactory.cpp" />
@@ -438,6 +439,7 @@
     <ClInclude Include="..\Vendors\imgui\imconfig.h" />
     <ClInclude Include="..\Vendors\imgui\imgui.h" />
     <ClInclude Include="..\Vendors\imgui\stb_textedit.h" />
+    <ClInclude Include="Audio.hh" />
     <ClInclude Include="Engine\BFC\BFCBlock.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManager.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManagerFactory.hpp" />
diff --git a/GameEngine/GameEngine/GameEngine.vcxproj.filters b/GameEngine/GameEngine/GameEngine.vcxproj.filters
index ecccfa583..6a0802bb4 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj.filters
+++ b/GameEngine/GameEngine/GameEngine.vcxproj.filters
@@ -218,6 +218,7 @@
     <ClCompile Include="Engine\BFC\BFCBlockManager.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManagerFactory.cpp" />
     <ClCompile Include="Engine\BFC\BFCLink.cpp" />
+    <ClCompile Include="Audio.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Vendors\imgui\imconfig.h" />
@@ -575,6 +576,7 @@
     <ClInclude Include="Engine\BFC\BFCItemID.hpp" />
     <ClInclude Include="Engine\BFC\BFCLink.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManagerFactory.hpp" />
+    <ClInclude Include="Audio.hh" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Engine\Components\Component.hh" />

From 80c6aded1f2f035655271f552a58866950c197d2 Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Thu, 4 Jun 2015 20:19:30 +0100
Subject: [PATCH 6/8] Remove FMOD dependence from the AssetEditor project.

---
 GameEngine/Tools/AssetsEditor/AssetsEditor.vcxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/GameEngine/Tools/AssetsEditor/AssetsEditor.vcxproj b/GameEngine/Tools/AssetsEditor/AssetsEditor.vcxproj
index 930fa58d6..42014819a 100644
--- a/GameEngine/Tools/AssetsEditor/AssetsEditor.vcxproj
+++ b/GameEngine/Tools/AssetsEditor/AssetsEditor.vcxproj
@@ -40,8 +40,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)../../Vendors/assimp/include;$(ProjectDir)../../Vendors/OpenGL/include;$(ProjectDir)../../GameEngine/Engine;$(ProjectDir)../../GameEngine;$(ProjectDir);$(ProjectDir)../../Vendors;$(IncludePath);$(ProjectDir)../../Vendors\bullet\src;$(SolutionDir)Vendors\fmod\inc;$(ProjectDir)../../Vendors/FreeImage/include;$(ProjectDir)../../EngineCoreTest/Systems;$(ProjectDir)../../EngineCoreTest/Components;$(ProjectDir)../../Vendors/FreeImagePlus/include;$(SolutionDir)</IncludePath>
-    <LibraryPath>$(ProjectDir)../../Vendors/assimp/x64/Debug;$(ProjectDir)../../Vendors/OpenGL/lib/x64;$(ProjectDir)../../Vendors\fmod\lib;$(ProjectDir)../../Vendors/bullet\lib\x64Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(ProjectDir)../../Vendors/FreeImage/Debug/;$(ProjectDir)../../Vendors/FreeImagePlus/Debug/;$(ProjectDir)../../Vendors\crunch\crnlib\lib\VC9\Debug\x64</LibraryPath>
+    <IncludePath>$(ProjectDir)../../Vendors/assimp/include;$(ProjectDir)../../Vendors/OpenGL/include;$(ProjectDir)../../GameEngine/Engine;$(ProjectDir)../../GameEngine;$(ProjectDir);$(ProjectDir)../../Vendors;$(IncludePath);$(ProjectDir)../../Vendors\bullet\src;$(ProjectDir)../../Vendors/FreeImage/include;$(ProjectDir)../../EngineCoreTest/Systems;$(ProjectDir)../../EngineCoreTest/Components;$(ProjectDir)../../Vendors/FreeImagePlus/include;$(SolutionDir)</IncludePath>
+    <LibraryPath>$(ProjectDir)../../Vendors/assimp/x64/Debug;$(ProjectDir)../../Vendors/OpenGL/lib/x64;$(ProjectDir)../../Vendors/bullet\lib\x64Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(ProjectDir)../../Vendors/FreeImage/Debug/;$(ProjectDir)../../Vendors/FreeImagePlus/Debug/;$(ProjectDir)../../Vendors\crunch\crnlib\lib\VC9\Debug\x64</LibraryPath>
     <SourcePath>$(VC_SourcePath);$(SolutionDir)EngineCoreTest/Systems;$(SolutionDir)EngineCoreTest/Components</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -63,7 +63,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;minizip_d.lib;zlib.lib;assimpd.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;fmodex64_vc.lib;BulletCollision_Debug.lib;BulletDynamics_Debug.lib;BulletFileLoader_Debug.lib;BulletMultiThreaded_Debug.lib;BulletSoftBody_Debug.lib;BulletWorldImporter_Debug.lib;BulletXmlWorldImporter_Debug.lib;ConvexDecomposition_Debug.lib;LinearMath_Debug.lib;%(AdditionalDependencies);FreeImagePlusd.lib;FreeImaged.lib;crnlibD_x64_VC9.lib</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;minizip_d.lib;zlib.lib;assimpd.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;sdl2main.lib;BulletCollision_Debug.lib;BulletDynamics_Debug.lib;BulletFileLoader_Debug.lib;BulletMultiThreaded_Debug.lib;BulletSoftBody_Debug.lib;BulletWorldImporter_Debug.lib;BulletXmlWorldImporter_Debug.lib;ConvexDecomposition_Debug.lib;LinearMath_Debug.lib;%(AdditionalDependencies);FreeImagePlusd.lib;FreeImaged.lib;crnlibD_x64_VC9.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)../../Vendors\zlib\lib\windows\x64;$(ProjectDir)../../Vendors\minizip\lib\windows\x64;C:\Program Files (x86)\Visual Leak Detector\lib\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
@@ -87,7 +87,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;minizip_d.lib;zlib.lib;assimp.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;FreeImage.lib;FreeImagePlus.lib;sdl2main.lib;fmodex64_vc.lib;BulletCollision.lib;BulletDynamics.lib;BulletFileLoader.lib;BulletMultiThreaded.lib;BulletSoftBody.lib;BulletWorldImporter.lib;BulletXmlWorldImporter.lib;ConvexDecomposition.lib;LinearMath.lib;crnlib_x64_VC9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;minizip_d.lib;zlib.lib;assimp.lib;opengl32.lib;glu32.lib;glew32.lib;sdl2.lib;FreeImage.lib;FreeImagePlus.lib;sdl2main.lib;BulletCollision.lib;BulletDynamics.lib;BulletFileLoader.lib;BulletMultiThreaded.lib;BulletSoftBody.lib;BulletWorldImporter.lib;BulletXmlWorldImporter.lib;ConvexDecomposition.lib;LinearMath.lib;crnlib_x64_VC9.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)../../Vendors\zlib\lib\windows\x64;$(ProjectDir)../../Vendors\minizip\lib\windows\x64;C:\Program Files (x86)\Visual Leak Detector\lib\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>

From c7b62f9a4979a58ee7564aaac43334d14da642cc Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Tue, 9 Jun 2015 16:30:12 +0100
Subject: [PATCH 7/8] Create an AudioManager class using SoLoud.

---
 GameEngine/GameEngine/Engine/Audio/Audio.cpp  |  76 ++++++++++
 GameEngine/GameEngine/Engine/Audio/Audio.hh   |  43 ++++++
 .../GameEngine/Engine/Audio/AudioManager.cpp  | 140 ++++++++++++------
 .../GameEngine/Engine/Audio/AudioManager.hh   |  38 +++--
 4 files changed, 242 insertions(+), 55 deletions(-)
 create mode 100644 GameEngine/GameEngine/Engine/Audio/Audio.cpp
 create mode 100644 GameEngine/GameEngine/Engine/Audio/Audio.hh

diff --git a/GameEngine/GameEngine/Engine/Audio/Audio.cpp b/GameEngine/GameEngine/Engine/Audio/Audio.cpp
new file mode 100644
index 000000000..afe590d95
--- /dev/null
+++ b/GameEngine/GameEngine/Engine/Audio/Audio.cpp
@@ -0,0 +1,76 @@
+#include "Audio.hh"
+
+Audio::Audio(SoLoud::Wav & sample) :
+_sample(sample),
+_volume(1.0f),
+_speed(1.0f),
+_pan(1.0f),
+_looping(false),
+_handle(0),
+_state(STOP)
+{
+}
+
+Audio::~Audio()
+{
+}
+
+SoLoud::Wav & Audio::getSample(void) const
+{
+	return this->_sample;
+}
+
+float Audio::getVolume(void) const
+{
+	return this->_volume;
+}
+
+float Audio::getSpeed(void) const
+{
+	return this->_speed;
+}
+
+float Audio::getPan(void) const
+{
+	return this->_pan;
+}
+
+int	Audio::getHandle(void) const
+{
+	return this->_handle;
+}
+
+bool Audio::getLooping(void) const
+{
+	return this->_looping;
+}
+
+void Audio::setSample(SoLoud::Wav & other)
+{
+	this->_sample = other;
+}
+
+void Audio::setVolume(float other)
+{
+	this->_volume = other;
+}
+
+void Audio::setSpeed(float other)
+{
+	this->_speed = other;
+}
+
+void Audio::setPan(float other)
+{
+	this->_pan = other;
+}
+
+void Audio::setHandle(int other)
+{
+	this->_handle = other;
+}
+
+void Audio::setLooping(bool other)
+{
+	this->_looping = other;
+}
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/Audio.hh b/GameEngine/GameEngine/Engine/Audio/Audio.hh
new file mode 100644
index 000000000..17416ddd1
--- /dev/null
+++ b/GameEngine/GameEngine/Engine/Audio/Audio.hh
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <soloud_wav.h>
+
+class Audio
+{
+public:
+	enum SoundPlayState
+	{
+		STOP = 0,
+		PLAY = 1,
+		PAUSE = 2
+	};
+
+	Audio(SoLoud::Wav & sample);
+	~Audio();
+
+	SoLoud::Wav & getSample(void) const;
+	float getVolume(void) const;
+	float getSpeed(void) const;
+	float getPan(void) const;
+	bool  getLooping(void) const;
+	int	  getHandle(void) const;
+	SoundPlayState getState(void) const;
+
+	void setSample(SoLoud::Wav & other);
+	void setVolume(float other);
+	void setSpeed(float other);
+	void setPan(float other);
+	void setLooping(bool other);
+	void setHandle(int other);
+	void setState(SoundPlayState other);
+
+private:
+	SoLoud::Wav &_sample;
+	float		_volume;
+	float		_speed;
+	float		_pan;
+	bool		_looping;
+	int			_handle;
+	SoundPlayState _state;
+};
+
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
index 00c058cfd..758c8b8c5 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
@@ -2,75 +2,131 @@
 #include <cassert>
 #include <iostream>
 
-AudioManager::AudioManager()
+AudioManager::AudioManager() :
+	_isInit(false)
 {}
 
 AudioManager::~AudioManager()
 {
+	this->_isInit = false;
 	this->_soloud.deinit();
-	/*
-	_audios.clear();
-	for (auto &&e : _channelGroups)
-	{
-		e.second->release();
-	}
-	_channelGroups.clear();
-	if (_system)
-	{
-		_system->close();
-		_system->release();
-	}*/
 }
 
 bool AudioManager::init()
 {
 	this->_soloud.init();
+	this->_isInit = true;
 	return true;
 }
-/*
-void AudioManager::update()
+
+bool AudioManager::isInitialized()
+{
+	return this->_isInit;
+}
+
+bool AudioManager::loadFile(std::string const path, std::string soundName)
+{
+	SoLoud::Wav* sample = new SoLoud::Wav();
+	auto res = sample->load(path.c_str());
+	Audio* sound = new Audio(*sample);
+	this->_audios.insert(std::pair<const std::string, Audio*>(soundName, sound));
+	return true;
+}
+
+bool AudioManager::loadMem(std::string path, std::string soundName)
+{
+	std::cerr << "ERROR: The memberfunction AudioManager::loadMem() is not yet implemented | "
+		<< __FILE__ << ":"
+		<< __LINE__ << std::endl;
+	return false;
+}
+
+bool AudioManager::loadStream(std::string path, std::string soundName)
+{
+	std::cerr << "ERROR: The memberfunction AudioManager::loadStream() is not yet implemented | "
+		<< __FILE__ << ":"
+		<< __LINE__ << std::endl;
+	return false;
+}
+
+float AudioManager::getVolume(void)
 {
-	_system->update();
+	if (_isInit)
+		return this->_soloud.getGlobalVolume();
+	else
+		return 0.f;
 }
 
-std::shared_ptr<Audio> AudioManager::loadSound(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name)
+void AudioManager::setVolume(float volume)
 {
-	std::string tname = name.empty() ? file.getShortFileName() : name;
-	if (_audios.find(tname) != std::end(_audios))
-		return _audios[tname];
+	if (_isInit)
+		this->_soloud.setGlobalVolume(volume);
+}
 
-	std::shared_ptr<Audio> audio{ new Audio(shared_from_this(), file, Audio::AudioType::AUDIO_SOUND, name) };
-	if (!audio->load(spacialType))
+void AudioManager::play(std::string soundName)
+{
+	if (_isInit)
 	{
-//		std::cout << "Audio load failed : " << tname << std::endl;
-		return nullptr;
+		auto sound = _audios.find(soundName)->second;
+		if (sound->getState() == Audio::STOP)
+			_soloud.play(sound->getSample(), sound->getVolume(), sound->getPan(), 0);
+		if (sound->getState() == Audio::PAUSE)
+			_soloud.setPause(sound->getHandle(), 0);
+		sound->setState(Audio::PLAY);
 	}
-	_audios.insert(std::make_pair(tname, audio));
-	return audio;
 }
 
-std::shared_ptr<Audio> AudioManager::loadStream(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name)
+void AudioManager::pause(std::string soundName)
 {
-	std::string tname = name.empty() ? file.getShortFileName() : name;
-	if (_audios.find(tname) != std::end(_audios))
-		return _audios[tname];
-	std::shared_ptr<Audio> audio{ new Audio(shared_from_this() , file, Audio::AudioType::AUDIO_STREAM, name) };
-	if (!audio->load(spacialType))
+	if (_isInit)
 	{
-//		std::cout << "Audio load failed : " << tname << std::endl;
-		return nullptr;
+		auto sound = _audios.find(soundName)->second;
+		if (sound->getState() == Audio::STOP)
+			_soloud.play(sound->getSample(), sound->getVolume(), sound->getPan(), 1);
+		if (sound->getState() == Audio::PLAY)
+			_soloud.setPause(sound->getHandle(), 1);
+		sound->setState(Audio::PAUSE);
 	}
-	_audios.insert(std::make_pair(tname, audio));
-	return audio;
 }
 
-FMOD::System *AudioManager::getSystem()
+void AudioManager::stop(std::string soundName)
+{
+	if (_isInit)
+	{
+		auto sound = _audios.find(soundName)->second;
+		_soloud.stop(sound->getHandle());
+		sound->setState(Audio::STOP);
+	}
+}
+
+void AudioManager::setLooping(std::string soundName, bool looping)
+{
+	auto sound = _audios.find(soundName)->second;
+	if (sound->getState() != Audio::STOP)
+		_soloud.setLooping(sound->getHandle(), looping);
+	sound->setLooping(looping);
+}
+
+void AudioManager::setVolume(std::string soundName, float volume)
+{
+	auto sound = _audios.find(soundName)->second;
+	if (sound->getState() != Audio::STOP)
+		_soloud.setVolume(sound->getHandle(), volume);
+	sound->setVolume(volume);
+}
+
+void AudioManager::setSpeed(std::string soundName, float speed)
 {
-	return _system;
+	auto sound = _audios.find(soundName)->second;
+	if (sound->getState() != Audio::STOP)
+		_soloud.setRelativePlaySpeed(sound->getHandle(), speed);
+	sound->setSpeed(speed);
 }
 
-FMOD::ChannelGroup *AudioManager::getChannelGroup(ChannelGroupType type)
+void AudioManager::setPan(std::string soundName, float pan)
 {
-	assert(_channelGroups.find(type) != std::end(_channelGroups) && "Channel goup not found.");
-	return _channelGroups[type];
-}*/
\ No newline at end of file
+	auto sound = _audios.find(soundName)->second;
+	if (sound->getState() != Audio::STOP)
+		_soloud.setPan(sound->getHandle(), pan);
+	sound->setPan(pan);
+}
\ No newline at end of file
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
index a44a42417..ef90f8220 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
@@ -1,27 +1,39 @@
 #pragma once
 
+#include <soloud.h>
+#include <soloud_wav.h>
 #include <Audio/ChannelGroupType.hpp>
 #include <Utils/Dependency.hpp>
 #include <memory>
 #include <map>
+#include <audio.hh>
 #include <iostream>
-#include <soloud.h>
 
 class AudioManager : public std::enable_shared_from_this<AudioManager>, public Dependency<AudioManager>
 {
 public:
-	AudioManager();
-	virtual ~AudioManager();
+	AudioManager(void);
+	virtual ~AudioManager(void);
+
 	bool init();
-	void update();
-	/*std::shared_ptr<Audio> loadSound(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name = "");
-	std::shared_ptr<Audio> loadStream(const OldFile &file, Audio::AudioSpatialType spacialType, const std::string &name = "");
-	FMOD::System *getSystem();
-	FMOD::ChannelGroup* getChannelGroup(ChannelGroupType type);
-	inline std::shared_ptr<Audio> getAudio(const std::string &name){ auto r = _audios.find(name); if (r == std::end(_audios)) return nullptr; return r->second; }*/
+	bool isInitialized();
+	bool loadFile(std::string path, std::string soundName);
+	bool loadMem(std::string path, std::string soundName);
+	bool loadStream(std::string path, std::string soundName);
+	float getVolume(void);
+	void  setVolume(float volume);
+
+	void play(std::string soundName);
+	void pause(std::string soundName);
+	void stop(std::string soundName);
+
+	void setLooping(std::string soundName, bool looping);
+	void setVolume(std::string soundName, float volume);
+	void setSpeed(std::string soundName, float speed);
+	void setPan(std::string soundName, float pan);
+
 private:
-	SoLoud::Soloud soloud;
-	/*
-	std::map<ChannelGroupType, FMOD::ChannelGroup*> _channelGroups;
-	std::map<std::string, std::shared_ptr<Audio>> _audios;*/
+	bool							_isInit;
+	SoLoud::Soloud					_soloud;
+	std::map<const std::string, Audio*>	_audios;
 };
\ No newline at end of file

From 51e156d25f967602d4bf848c839298044663d6c7 Mon Sep 17 00:00:00 2001
From: Lauralie <laureline.patoz@gmail.com>
Date: Tue, 9 Jun 2015 16:37:54 +0100
Subject: [PATCH 8/8] Clean the audio code

Adds some const refs and change the Audio files emplacement.
---
 .../GameEngine/Engine/Audio/AudioManager.cpp  | 22 +++++++-------
 .../GameEngine/Engine/Audio/AudioManager.hh   | 30 +++++++++----------
 GameEngine/GameEngine/GameEngine.vcxproj      |  4 +--
 .../GameEngine/GameEngine.vcxproj.filters     |  4 +--
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
index 758c8b8c5..6ebb0aa44 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.cpp
@@ -1,6 +1,4 @@
 #include <Audio/AudioManager.hh>
-#include <cassert>
-#include <iostream>
 
 AudioManager::AudioManager() :
 	_isInit(false)
@@ -24,7 +22,7 @@ bool AudioManager::isInitialized()
 	return this->_isInit;
 }
 
-bool AudioManager::loadFile(std::string const path, std::string soundName)
+bool AudioManager::loadFile(std::string const& path, std::string const& soundName)
 {
 	SoLoud::Wav* sample = new SoLoud::Wav();
 	auto res = sample->load(path.c_str());
@@ -33,7 +31,7 @@ bool AudioManager::loadFile(std::string const path, std::string soundName)
 	return true;
 }
 
-bool AudioManager::loadMem(std::string path, std::string soundName)
+bool AudioManager::loadMem(std::string const& path, std::string const& soundName)
 {
 	std::cerr << "ERROR: The memberfunction AudioManager::loadMem() is not yet implemented | "
 		<< __FILE__ << ":"
@@ -41,7 +39,7 @@ bool AudioManager::loadMem(std::string path, std::string soundName)
 	return false;
 }
 
-bool AudioManager::loadStream(std::string path, std::string soundName)
+bool AudioManager::loadStream(std::string const& path, std::string const& soundName)
 {
 	std::cerr << "ERROR: The memberfunction AudioManager::loadStream() is not yet implemented | "
 		<< __FILE__ << ":"
@@ -63,7 +61,7 @@ void AudioManager::setVolume(float volume)
 		this->_soloud.setGlobalVolume(volume);
 }
 
-void AudioManager::play(std::string soundName)
+void AudioManager::play(std::string const& soundName)
 {
 	if (_isInit)
 	{
@@ -76,7 +74,7 @@ void AudioManager::play(std::string soundName)
 	}
 }
 
-void AudioManager::pause(std::string soundName)
+void AudioManager::pause(std::string const& soundName)
 {
 	if (_isInit)
 	{
@@ -89,7 +87,7 @@ void AudioManager::pause(std::string soundName)
 	}
 }
 
-void AudioManager::stop(std::string soundName)
+void AudioManager::stop(std::string const& soundName)
 {
 	if (_isInit)
 	{
@@ -99,7 +97,7 @@ void AudioManager::stop(std::string soundName)
 	}
 }
 
-void AudioManager::setLooping(std::string soundName, bool looping)
+void AudioManager::setLooping(std::string const& soundName, bool looping)
 {
 	auto sound = _audios.find(soundName)->second;
 	if (sound->getState() != Audio::STOP)
@@ -107,7 +105,7 @@ void AudioManager::setLooping(std::string soundName, bool looping)
 	sound->setLooping(looping);
 }
 
-void AudioManager::setVolume(std::string soundName, float volume)
+void AudioManager::setVolume(std::string const& soundName, float volume)
 {
 	auto sound = _audios.find(soundName)->second;
 	if (sound->getState() != Audio::STOP)
@@ -115,7 +113,7 @@ void AudioManager::setVolume(std::string soundName, float volume)
 	sound->setVolume(volume);
 }
 
-void AudioManager::setSpeed(std::string soundName, float speed)
+void AudioManager::setSpeed(std::string const& soundName, float speed)
 {
 	auto sound = _audios.find(soundName)->second;
 	if (sound->getState() != Audio::STOP)
@@ -123,7 +121,7 @@ void AudioManager::setSpeed(std::string soundName, float speed)
 	sound->setSpeed(speed);
 }
 
-void AudioManager::setPan(std::string soundName, float pan)
+void AudioManager::setPan(std::string const& soundName, float pan)
 {
 	auto sound = _audios.find(soundName)->second;
 	if (sound->getState() != Audio::STOP)
diff --git a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
index ef90f8220..5b5efbd95 100644
--- a/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
+++ b/GameEngine/GameEngine/Engine/Audio/AudioManager.hh
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <map>
+#include <iostream>
+
 #include <soloud.h>
 #include <soloud_wav.h>
-#include <Audio/ChannelGroupType.hpp>
+
 #include <Utils/Dependency.hpp>
-#include <memory>
-#include <map>
-#include <audio.hh>
-#include <iostream>
+#include <Audio/audio.hh>
 
 class AudioManager : public std::enable_shared_from_this<AudioManager>, public Dependency<AudioManager>
 {
@@ -17,20 +17,20 @@ public:
 
 	bool init();
 	bool isInitialized();
-	bool loadFile(std::string path, std::string soundName);
-	bool loadMem(std::string path, std::string soundName);
-	bool loadStream(std::string path, std::string soundName);
+	bool loadFile(std::string const& path, std::string const& soundName);
+	bool loadMem(std::string const& path, std::string const& soundName);
+	bool loadStream(std::string const& path, std::string const& soundName);
 	float getVolume(void);
 	void  setVolume(float volume);
 
-	void play(std::string soundName);
-	void pause(std::string soundName);
-	void stop(std::string soundName);
+	void play(std::string const& soundName);
+	void pause(std::string const& soundName);
+	void stop(std::string const& soundName);
 
-	void setLooping(std::string soundName, bool looping);
-	void setVolume(std::string soundName, float volume);
-	void setSpeed(std::string soundName, float speed);
-	void setPan(std::string soundName, float pan);
+	void setLooping(std::string const& soundName, bool looping);
+	void setVolume(std::string const& soundName, float volume);
+	void setSpeed(std::string const& soundName, float speed);
+	void setPan(std::string const& soundName, float pan);
 
 private:
 	bool							_isInit;
diff --git a/GameEngine/GameEngine/GameEngine.vcxproj b/GameEngine/GameEngine/GameEngine.vcxproj
index 217a012de..aab4da507 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj
+++ b/GameEngine/GameEngine/GameEngine.vcxproj
@@ -235,7 +235,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Vendors\imgui\imgui.cpp" />
-    <ClCompile Include="Audio.cpp" />
+    <ClCompile Include="Engine\Audio\Audio.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlock.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManager.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManagerFactory.cpp" />
@@ -439,7 +439,7 @@
     <ClInclude Include="..\Vendors\imgui\imconfig.h" />
     <ClInclude Include="..\Vendors\imgui\imgui.h" />
     <ClInclude Include="..\Vendors\imgui\stb_textedit.h" />
-    <ClInclude Include="Audio.hh" />
+    <ClInclude Include="Engine\Audio\Audio.hh" />
     <ClInclude Include="Engine\BFC\BFCBlock.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManager.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManagerFactory.hpp" />
diff --git a/GameEngine/GameEngine/GameEngine.vcxproj.filters b/GameEngine/GameEngine/GameEngine.vcxproj.filters
index 6a0802bb4..ff4bbf9f0 100644
--- a/GameEngine/GameEngine/GameEngine.vcxproj.filters
+++ b/GameEngine/GameEngine/GameEngine.vcxproj.filters
@@ -218,7 +218,7 @@
     <ClCompile Include="Engine\BFC\BFCBlockManager.cpp" />
     <ClCompile Include="Engine\BFC\BFCBlockManagerFactory.cpp" />
     <ClCompile Include="Engine\BFC\BFCLink.cpp" />
-    <ClCompile Include="Audio.cpp" />
+    <ClCompile Include="Engine\Audio\Audio.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Vendors\imgui\imconfig.h" />
@@ -576,7 +576,7 @@
     <ClInclude Include="Engine\BFC\BFCItemID.hpp" />
     <ClInclude Include="Engine\BFC\BFCLink.hpp" />
     <ClInclude Include="Engine\BFC\BFCBlockManagerFactory.hpp" />
-    <ClInclude Include="Audio.hh" />
+    <ClInclude Include="Engine\Audio\Audio.hh" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Engine\Components\Component.hh" />