Remove unnecessary Src/ folders

Source/Core/AudioCommon/AudioCommon.cpp

@@ -15,8 +15,8 @@
 #include "OpenALStream.h"
 #include "PulseAudioStream.h"
 #include "OpenSLESStream.h"
-#include "../../Core/Src/Movie.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Core/Movie.h"
+#include "../Core/ConfigManager.h"
 
 // This shouldn't be a global, at least not here.
 SoundStream *soundStream = nullptr;

Source/Core/AudioCommon/AudioCommon.vcxproj

@@ -43,40 +43,40 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-    <ClCompile Include="Src\DSoundStream.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\NullSoundStream.cpp" />
-    <ClCompile Include="Src\OpenALStream.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="DSoundStream.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="NullSoundStream.cpp" />
+    <ClCompile Include="OpenALStream.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\XAudio2Stream.cpp" />
-    <ClCompile Include="Src\XAudio2_7Stream.cpp">
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="XAudio2Stream.cpp" />
+    <ClCompile Include="XAudio2_7Stream.cpp">
       <AdditionalIncludeDirectories Condition="Exists('$(DXSDK_DIR)')">$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AlsaSoundStream.h" />
-    <ClInclude Include="Src\AOSoundStream.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\CoreAudioSoundStream.h" />
-    <ClInclude Include="Src\DPL2Decoder.h" />
-    <ClInclude Include="Src\DSoundStream.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\NullSoundStream.h" />
-    <ClInclude Include="Src\OpenALStream.h" />
-    <ClInclude Include="Src\OpenSLESStream.h" />
-    <ClInclude Include="Src\PulseAudioStream.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\XAudio2Stream.h" />
-    <ClInclude Include="Src\XAudio2_7Stream.h" />
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AlsaSoundStream.h" />
+    <ClInclude Include="AOSoundStream.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="CoreAudioSoundStream.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="DSoundStream.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="NullSoundStream.h" />
+    <ClInclude Include="OpenALStream.h" />
+    <ClInclude Include="OpenSLESStream.h" />
+    <ClInclude Include="PulseAudioStream.h" />
+    <ClInclude Include="SoundStream.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="XAudio2Stream.h" />
+    <ClInclude Include="XAudio2_7Stream.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
@@ -92,4 +92,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/AudioCommon/AudioCommon.vcxproj.filters

@@ -6,64 +6,64 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Src\aldlist.cpp" />
-    <ClCompile Include="Src\AudioCommon.cpp" />
-    <ClCompile Include="Src\DPL2Decoder.cpp" />
-    <ClCompile Include="Src\Mixer.cpp" />
-    <ClCompile Include="Src\WaveFile.cpp" />
-    <ClCompile Include="Src\DSoundStream.cpp">
+    <ClCompile Include="aldlist.cpp" />
+    <ClCompile Include="AudioCommon.cpp" />
+    <ClCompile Include="DPL2Decoder.cpp" />
+    <ClCompile Include="Mixer.cpp" />
+    <ClCompile Include="WaveFile.cpp" />
+    <ClCompile Include="DSoundStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\NullSoundStream.cpp">
+    <ClCompile Include="NullSoundStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OpenALStream.cpp">
+    <ClCompile Include="OpenALStream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\XAudio2Stream.cpp">
+    <ClCompile Include="XAudio2Stream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\XAudio2_7Stream.cpp">
+    <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="XAudio2_7Stream.cpp">
       <Filter>SoundStreams</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Src\aldlist.h" />
-    <ClInclude Include="Src\AudioCommon.h" />
-    <ClInclude Include="Src\DPL2Decoder.h" />
-    <ClInclude Include="Src\Mixer.h" />
-    <ClInclude Include="Src\SoundStream.h" />
-    <ClInclude Include="Src\WaveFile.h" />
-    <ClInclude Include="Src\AOSoundStream.h">
+    <ClInclude Include="aldlist.h" />
+    <ClInclude Include="AudioCommon.h" />
+    <ClInclude Include="DPL2Decoder.h" />
+    <ClInclude Include="Mixer.h" />
+    <ClInclude Include="SoundStream.h" />
+    <ClInclude Include="WaveFile.h" />
+    <ClInclude Include="AOSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DSoundStream.h">
+    <ClInclude Include="DSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\NullSoundStream.h">
+    <ClInclude Include="NullSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpenALStream.h">
+    <ClInclude Include="OpenALStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\XAudio2Stream.h">
+    <ClInclude Include="XAudio2Stream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\XAudio2_7Stream.h">
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="XAudio2_7Stream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\PulseAudioStream.h">
+    <ClInclude Include="PulseAudioStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpenSLESStream.h">
+    <ClInclude Include="OpenSLESStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\CoreAudioSoundStream.h">
+    <ClInclude Include="CoreAudioSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
-    <ClInclude Include="Src\AlsaSoundStream.h">
+    <ClInclude Include="AlsaSoundStream.h">
       <Filter>SoundStreams</Filter>
     </ClInclude>
   </ItemGroup>

Source/Core/AudioCommon/CMakeLists.txt

@@ -1,43 +1,43 @@
-set(SRCS	Src/AudioCommon.cpp
-			Src/DPL2Decoder.cpp
-			Src/Mixer.cpp
-			Src/WaveFile.cpp
-			Src/NullSoundStream.cpp)
+set(SRCS	AudioCommon.cpp
+			DPL2Decoder.cpp
+			Mixer.cpp
+			WaveFile.cpp
+			NullSoundStream.cpp)
 
 set(LIBS "")
 
 if(ANDROID)
-	set(SRCS ${SRCS} Src/OpenSLESStream.cpp)
+	set(SRCS ${SRCS} OpenSLESStream.cpp)
 	set(LIBS ${LIBS} OpenSLES)
 endif(ANDROID)
 
 if(ALSA_FOUND)
-	set(SRCS ${SRCS} Src/AlsaSoundStream.cpp)
+	set(SRCS ${SRCS} AlsaSoundStream.cpp)
 	set(LIBS ${LIBS} ${ALSA_LIBRARIES})
 endif(ALSA_FOUND)
 
 if(AO_FOUND)
-	set(SRCS ${SRCS} Src/AOSoundStream.cpp)
+	set(SRCS ${SRCS} AOSoundStream.cpp)
 	set(LIBS ${LIBS} ${AO_LIBRARIES})
 endif(AO_FOUND)
 
 if(OPENAL_FOUND)
-	set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp)
+	set(SRCS ${SRCS} OpenALStream.cpp aldlist.cpp)
 	set(LIBS ${LIBS} ${OPENAL_LIBRARY} SoundTouch )
 endif(OPENAL_FOUND)
 
 if(PULSEAUDIO_FOUND)
-	set(SRCS ${SRCS} Src/PulseAudioStream.cpp)
+	set(SRCS ${SRCS} PulseAudioStream.cpp)
 	set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES})
 endif(PULSEAUDIO_FOUND)
 
 if(WIN32)
-	set(SRCS ${SRCS} Src/DSoundStream.cpp)
-	set(SRCS ${SRCS} Src/XAudio2Stream.cpp)
+	set(SRCS ${SRCS} DSoundStream.cpp)
+	set(SRCS ${SRCS} XAudio2Stream.cpp)
 endif(WIN32)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(SRCS ${SRCS} Src/CoreAudioSoundStream.cpp)
+	set(SRCS ${SRCS} CoreAudioSoundStream.cpp)
 endif()
 
 add_dolphin_library(audiocommon "${SRCS}" "${LIBS}")

Source/Core/AudioCommon/Mixer.cpp

@@ -6,12 +6,12 @@
 #include "Mixer.h"
 #include "AudioCommon.h"
 #include "CPUDetect.h"
-#include "../../Core/Src/Host.h"
+#include "../Core/Host.h"
 
-#include "../../Core/Src/HW/AudioInterface.h"
+#include "../Core/HW/AudioInterface.h"
 
 // UGLINESS
-#include "../../Core/Src/PowerPC/PowerPC.h"
+#include "../Core/PowerPC/PowerPC.h"
 
 #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
 #include <tmmintrin.h>

Source/Core/AudioCommon/NullSoundStream.cpp

@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "NullSoundStream.h"
-#include "../../Core/Src/HW/SystemTimers.h"
-#include "../../Core/Src/HW/AudioInterface.h"
+#include "../Core/HW/SystemTimers.h"
+#include "../Core/HW/AudioInterface.h"
 
 void NullSound::SoundLoop()
 {

Source/Core/AudioCommon/WaveFile.cpp

@@ -4,7 +4,7 @@
 
 #include "Common.h"
 #include "WaveFile.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Core/ConfigManager.h"
 
 enum {BUF_SIZE = 32*1024};
 

Source/Core/AudioCommon/aldlist.cpp

@@ -25,8 +25,8 @@
 #include "Common.h"
 #include "aldlist.h"
 #ifdef _WIN32
-#include "../../../../Externals/OpenAL/include/al.h"
-#include "../../../../Externals/OpenAL/include/alc.h"
+#include "../../../Externals/OpenAL/include/al.h"
+#include "../../../Externals/OpenAL/include/alc.h"
 #elif defined(__APPLE__)
 #include <al.h>
 #include <alc.h>