Merge/sync fixes after threaded audio

2021-07-10 23:06:36 +03:00 · 2021-07-10 23:06:36 +03:00 · d82dbf91ef
parent db4ae18e5d
commit d82dbf91ef
2 changed files with 7 additions and 2 deletions
--- 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;
--- 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