- put the entire filesystem code into a namespace and created some subdirectories.

src/common/audio/music/i_music.cpp

@@ -53,6 +53,7 @@
 #include "s_music.h"
 #include "filereadermusicinterface.h"
 
+using namespace FileSys;
 
 
 void I_InitSoundFonts();
@@ -192,7 +193,7 @@ static void SetupWgOpn()
 	{
 		return;
 	}
-	FileData data = fileSystem.ReadFile(lump);
+	auto data = fileSystem.ReadFile(lump);
 	ZMusic_SetWgOpn(data.GetMem(), (uint32_t)data.GetSize());
 }
 
@@ -204,7 +205,7 @@ static void SetupDMXGUS()
 	{
 		return;
 	}
-	FileData data = fileSystem.ReadFile(lump);
+	auto data = fileSystem.ReadFile(lump);
 	ZMusic_SetDmxGus(data.GetMem(), (uint32_t)data.GetSize());
 }
 

src/common/audio/music/i_soundfont.cpp

@@ -40,10 +40,9 @@
 #include "i_system.h"
 #include "filereadermusicinterface.h"
 #include <zmusic.h>
-#include "resourcefile.h"
+#include "fs_filesystem.h"
 #include "version.h"
 #include "fs_findfile.h"
-#include "resourcefile.h"
 #include "i_interface.h"
 #include "configfile.h"
 #include "printf.h"
@@ -402,7 +401,7 @@ void FSoundFontManager::CollectSoundfonts()
 		{
 			if (stricmp (key, "Path") == 0)
 			{
-				FileList list;
+				FileSys::FileList list;
 
 				FString dir;
 
@@ -410,7 +409,7 @@ void FSoundFontManager::CollectSoundfonts()
 				FixPathSeperator(dir);
 				if (dir.IsNotEmpty())
 				{
-					if (ScanDirectory(list, dir.GetChars(), "*", true))
+					if (FileSys::ScanDirectory(list, dir.GetChars(), "*", true))
 					{
 						for(auto& entry : list)
 						{

src/common/audio/music/music.cpp

@@ -55,6 +55,7 @@
 #include "i_specialpaths.h"
 #include "configfile.h"
 #include "c_cvars.h"
+#include "md5.h"
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 

src/common/audio/music/s_music.h

@@ -5,9 +5,9 @@
 #include "zstring.h"
 #include "tarray.h"
 #include "name.h"
+#include "files.h"
 #include <zmusic.h>
 
-class FileReader;
 class SoundStream;
 
 

src/common/audio/sound/i_sound.h

@@ -40,8 +40,8 @@
 #include "i_soundinternal.h"
 #include "zstring.h"
 #include <zmusic.h>
+#include "files.h"
 
-class FileReader;
 struct FSoundChan;
 
 enum EStartSoundFlags