diff --git a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp index 48d5201cd..c1ae22d3b 100755 --- a/core/linux-dist/main.cpp +++ b/core/linux-dist/main.cpp @@ -874,7 +874,7 @@ int main(int argc, wchar* argv[]) } u32 alsa_Push(void* frame, u32 samples, bool wait); -u32 os_Push(void* frame, u32 samples, bool wait) +u32 PushAudio(void* frame, u32 samples, bool wait) { #ifndef TARGET_PANDORA int audio_fd = -1; diff --git a/core/oslib/audiostream.cpp b/core/oslib/audiostream.cpp index 4a6f96044..d90cc9fb6 100644 --- a/core/oslib/audiostream.cpp +++ b/core/oslib/audiostream.cpp @@ -23,7 +23,7 @@ WaveWriter rawout("d:\\aica_out.wav"); #endif -u32 os_Push(void* frame, u32 amt, bool wait); +u32 PushAudio(void* frame, u32 amt, bool wait); //void os_Pull(u32 level) u32 asRingUsedCount() @@ -92,7 +92,7 @@ void WriteSample(s16 r, s16 l) if (WritePtr==(SAMPLE_COUNT-1)) { - os_Push(RingBuffer,SAMPLE_COUNT,settings.aica.LimitFPS); + PushAudio(RingBuffer,SAMPLE_COUNT,settings.aica.LimitFPS); } } diff --git a/core/oslib/ds_audiostream.cpp b/core/oslib/ds_audiostream.cpp index f559cd2ae..131126dad 100644 --- a/core/oslib/ds_audiostream.cpp +++ b/core/oslib/ds_audiostream.cpp @@ -155,7 +155,7 @@ u32 os_Push_nw(void* frame, u32 samplesb) //ds_ring_size } -u32 os_Push(void* frame, u32 samples, bool wait) +u32 PushAudio(void* frame, u32 samples, bool wait) { u16* f=(u16*)frame; diff --git a/core/sdl/main.cpp b/core/sdl/main.cpp index 3a2acb30e..95f0aef05 100755 --- a/core/sdl/main.cpp +++ b/core/sdl/main.cpp @@ -515,7 +515,7 @@ int main(int argc, wchar* argv[]) return 0; } -u32 os_Push(void* frame, u32 samples, bool wait) +u32 PushAudio(void* frame, u32 samples, bool wait) { #ifdef USE_OSS static bool blocking = true; diff --git a/shell/android/jni/src/Android.cpp b/shell/android/jni/src/Android.cpp index e5a873ed4..6001c6a66 100644 --- a/shell/android/jni/src/Android.cpp +++ b/shell/android/jni/src/Android.cpp @@ -485,7 +485,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_initControllers(JNIEn env->ReleaseBooleanArrayElements(controllers, controllers_body, 0); } -u32 os_Push(void* frame, u32 amt, bool wait) +u32 PushAudio(void* frame, u32 amt, bool wait) { verify(amt==SAMPLE_COUNT); //yeah, do some audio piping magic here !