mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 07:18:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge/sync fixes after threaded audio

Browse source
This commit is contained in:
erorcun 2021-07-10 23:06:36 +03:00
parent db4ae18e5d
commit d82dbf91ef
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/audio/sampman_oal.cpp
View file

@ -582,6 +582,8 @@ _FindMP3s(void)
total_ms = aStream[0]->GetLengthMS(); total_ms = aStream[0]->GetLengthMS();
aStream[0]->Close(); aStream[0]->Close();
OutputDebugString(fd.cFileName);
pList->pNext = new tMP3Entry; pList->pNext = new tMP3Entry;
tMP3Entry *e = pList->pNext; tMP3Entry *e = pList->pNext;

7
src/core/config.h
View file

@ -527,8 +527,11 @@ enum Config {
#undef CANCELLABLE_CAR_ENTER #undef CANCELLABLE_CAR_ENTER
#undef IMPROVED_CAMERA #undef IMPROVED_CAMERA
#undef FREE_CAM #undef FREE_CAM
#undef MULTITHREADED_AUDIO
#undef RADIO_SCROLL_TO_PREV_STATION #undef RADIO_SCROLL_TO_PREV_STATION
#undef BIG_IMG #undef AUDIO_CACHE
#undef PS2_AUDIO_CHANNELS #undef PS2_AUDIO_CHANNELS
#undef PAUSE_RADIO_IN_FRONTEND
#undef MULTITHREADED_AUDIO
#undef BIG_IMG
#endif #endif