From d82dbf91efc022a27853decd109f58aa54ebc1ee Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sat, 10 Jul 2021 23:06:36 +0300
Subject: [PATCH] Merge/sync fixes after threaded audio

---
 src/audio/sampman_oal.cpp | 2 ++
 src/core/config.h         | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index b96df8c4..fdd449f7 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -582,6 +582,8 @@ _FindMP3s(void)
 					total_ms = aStream[0]->GetLengthMS();
 					aStream[0]->Close();
 
+					OutputDebugString(fd.cFileName);
+					
 					pList->pNext = new tMP3Entry;
 					
 					tMP3Entry *e = pList->pNext;
diff --git a/src/core/config.h b/src/core/config.h
index 1c7b06d3..298b2a1a 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -527,8 +527,11 @@ enum Config {
 #undef CANCELLABLE_CAR_ENTER
 #undef IMPROVED_CAMERA
 #undef FREE_CAM
-#undef MULTITHREADED_AUDIO
+
 #undef RADIO_SCROLL_TO_PREV_STATION
-#undef BIG_IMG
+#undef AUDIO_CACHE
 #undef PS2_AUDIO_CHANNELS
+#undef PAUSE_RADIO_IN_FRONTEND
+#undef MULTITHREADED_AUDIO
+#undef BIG_IMG
 #endif