3 files changed, 28 insertions, 24 deletions

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index f9c02821..8c7b3232 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -4,20 +4,23 @@
 #include "stream.h"
 #include "sampman.h"
 
-#ifdef AUDIO_OPUS
-#include <opusfile.h>
-#else
 #ifdef _WIN32
 #ifdef AUDIO_OAL_USE_SNDFILE
 #pragma comment( lib, "libsndfile-1.lib" )
 #endif
+#ifdef AUDIO_OAL_USE_MPG123
 #pragma comment( lib, "libmpg123-0.lib" )
 #endif
+#endif
 #ifdef AUDIO_OAL_USE_SNDFILE
 #include <sndfile.h>
 #endif
+#ifdef AUDIO_OAL_USE_MPG123
 #include <mpg123.h>
 #endif
+#ifdef AUDIO_OAL_USE_OPUS
+#include <opusfile.h>
+#endif
 
 #ifndef _WIN32
 #include "crossplatform.h"
@@ -81,7 +84,6 @@ public:
 
 CSortStereoBuffer SortStereoBuffer;
 
-#ifndef AUDIO_OPUS
 class CImaADPCMDecoder
 {
 	const uint16 StepTable[89] = {
@@ -461,11 +463,9 @@ public:
 };
 #endif
 
-#ifdef _WIN32
+#ifdef AUDIO_OAL_USE_MPG123
 // fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
 #define MP3_USE_FUZZY_SEEK
-#endif // _WIN32
-
 
 class CMP3File : public IDecoder
 {
@@ -567,6 +567,7 @@ public:
 	}
 };
 
+#endif
 #define VAG_LINE_SIZE (0x10)
 #define VAG_SAMPLES_IN_LINE (28)
 
@@ -804,7 +805,7 @@ public:
 		return bufSizePerChannel * m_nChannels;
 	}
 };
-#else
+#ifdef AUDIO_OAL_USE_OPUS
 class COpusFile : public IDecoder
 {
 	OggOpusFile *m_FileH;
@@ -902,14 +903,14 @@ public:
 
 void CStream::Initialise()
 {
-#ifndef AUDIO_OPUS
+#ifdef AUDIO_OAL_USE_MPG123
 	mpg123_init();
 #endif
 }
 
 void CStream::Terminate()
 {
-#ifndef AUDIO_OPUS
+#ifdef AUDIO_OAL_USE_MPG123
 	mpg123_exit();
 #endif
 }
@@ -942,19 +943,20 @@ CStream::CStream(char *filename, ALuint *sources, ALuint (&buffers)[NUM_STREAMBU
 		
 	DEV("Stream %s\n", m_aFilename);
 
-#ifndef AUDIO_OPUS
-	if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".mp3")], ".mp3"))
-		m_pSoundFile = new CMP3File(m_aFilename);
-	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".wav")], ".wav"))
+	if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".wav")], ".wav"))
 #ifdef AUDIO_OAL_USE_SNDFILE
 		m_pSoundFile = new CSndFile(m_aFilename);
 #else
 		m_pSoundFile = new CWavFile(m_aFilename);
 #endif
+#ifdef AUDIO_OAL_USE_MPG123
+	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".mp3")], ".mp3"))
+		m_pSoundFile = new CMP3File(m_aFilename);
+#endif
 	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".vb")], ".VB"))
 		m_pSoundFile = new CVbFile(m_aFilename, overrideSampleRate);
-#else
-	if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".opus")], ".opus"))
+#ifdef AUDIO_OAL_USE_OPUS
+	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".opus")], ".opus"))
 		m_pSoundFile = new COpusFile(m_aFilename);
 #endif
 	else 
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 2284d385..72c3eb7f 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -218,7 +218,7 @@ extern uint32 BankStartOffset[MAX_SFX_BANKS];
 extern int defaultProvider;
 #endif
 
-#ifdef AUDIO_OPUS
+#if defined(OPUS_AUDIO_PATHS)
 static char StreamedNameTable[][25] = {
     "AUDIO\\HEAD.OPUS",    "AUDIO\\CLASS.OPUS",   "AUDIO\\KJAH.OPUS",    "AUDIO\\RISE.OPUS",    "AUDIO\\LIPS.OPUS",    "AUDIO\\GAME.OPUS",
     "AUDIO\\MSX.OPUS",     "AUDIO\\FLASH.OPUS",   "AUDIO\\CHAT.OPUS",    "AUDIO\\HEAD.OPUS",    "AUDIO\\POLICE.OPUS",  "AUDIO\\CITY.OPUS",
@@ -254,9 +254,9 @@ static char StreamedNameTable[][25] = {
     "AUDIO\\door_2.OPUS",  "AUDIO\\door_3.OPUS",  "AUDIO\\door_4.OPUS",  "AUDIO\\door_5.OPUS",  "AUDIO\\door_6.OPUS",  "AUDIO\\t3_a.OPUS",
     "AUDIO\\t3_b.OPUS",    "AUDIO\\t3_c.OPUS",    "AUDIO\\k1_b.OPUS",    "AUDIO\\cat1.OPUS"};
 #else
+#if defined(PS2_AUDIO_PATHS)
 static char StreamedNameTable[][25]=
 {
-#ifdef PS2_AUDIO
 	"AUDIO\\MUSIC\\HEAD.VB",
 	"AUDIO\\MUSIC\\CLASS.VB",
 	"AUDIO\\MUSIC\\KJAH.VB",
@@ -353,6 +353,8 @@ static char StreamedNameTable[][25]=
 	"AUDIO\\MUSIC\\MISCOM.VB",
 	"AUDIO\\MUSIC\\END.VB",
 #else
+static char StreamedNameTable[][25] =
+{
 	"AUDIO\\HEAD.WAV",
 	"AUDIO\\CLASS.WAV",
 	"AUDIO\\KJAH.WAV",
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 07d943e3..bb7f0aac 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -30,7 +30,7 @@
 #include "MusicManager.h"
 #include "Frontend.h"
 #include "Timer.h"
-#ifdef AUDIO_OPUS
+#ifdef AUDIO_OAL_USE_OPUS
 #include <opusfile.h>
 #endif
 
@@ -83,7 +83,7 @@ char SampleBankDescFilename[] = "audio/sfx.SDT";
 char SampleBankDataFilename[] = "audio/sfx.RAW";
 
 FILE *fpSampleDescHandle;
-#ifdef AUDIO_OPUS
+#ifdef OPUS_SFX
 OggOpusFile *fpSampleDataHandle;
 #else
 FILE *fpSampleDataHandle;
@@ -1218,7 +1218,7 @@ cSampleManager::LoadSampleBank(uint8 nBank)
 		return false;
 	}
 	
-#ifdef AUDIO_OPUS
+#ifdef OPUS_SFX
 	int samplesRead = 0;
 	int samplesSize = nSampleBankSize[nBank] / 2;
 	op_pcm_seek(fpSampleDataHandle, 0);
@@ -1331,7 +1331,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 		}
 	}
 
-#ifdef AUDIO_OPUS
+#ifdef OPUS_SFX
 	int samplesRead = 0;
 	int samplesSize = m_aSamples[nComment].nSize / 2;
 	op_pcm_seek(fpSampleDataHandle, m_aSamples[nComment].nOffset / 2);
@@ -1978,7 +1978,7 @@ cSampleManager::InitialiseSampleBanks(void)
 	fpSampleDescHandle = fcaseopen(SampleBankDescFilename, "rb");
 	if ( fpSampleDescHandle == NULL )
 		return false;
-#ifndef AUDIO_OPUS
+#ifndef OPUS_SFX
 	fpSampleDataHandle = fcaseopen(SampleBankDataFilename, "rb");
 	if ( fpSampleDataHandle == NULL )
 	{
@@ -1996,7 +1996,7 @@ cSampleManager::InitialiseSampleBanks(void)
 	fpSampleDataHandle = op_open_file(SampleBankDataFilename, &e);
 #endif
 	fread(m_aSamples, sizeof(tSample), TOTAL_AUDIO_SAMPLES, fpSampleDescHandle);
-#ifdef AUDIO_OPUS
+#ifdef OPUS_SFX
 	int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize;
 #endif
 	fclose(fpSampleDescHandle);