ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename os_Push() to PushAudio() for consistency

This commit is contained in:
Jan Holthuis 2015-04-14 15:50:08 +02:00
parent 55c6667753
commit 35968c8291
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/linux-dist/main.cpp
View File

@ -874,7 +874,7 @@ int main(int argc, wchar* argv[])
} }
u32 alsa_Push(void* frame, u32 samples, bool wait); 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 #ifndef TARGET_PANDORA
int audio_fd = -1; int audio_fd = -1;

4
core/oslib/audiostream.cpp
View File

@ -23,7 +23,7 @@ WaveWriter rawout("d:\\aica_out.wav");
#endif #endif
u32 os_Push(void* frame, u32 amt, bool wait); u32 PushAudio(void* frame, u32 amt, bool wait);
//void os_Pull(u32 level) //void os_Pull(u32 level)
u32 asRingUsedCount() u32 asRingUsedCount()
@ -92,7 +92,7 @@ void WriteSample(s16 r, s16 l)
if (WritePtr==(SAMPLE_COUNT-1)) if (WritePtr==(SAMPLE_COUNT-1))
{ {
os_Push(RingBuffer,SAMPLE_COUNT,settings.aica.LimitFPS); PushAudio(RingBuffer,SAMPLE_COUNT,settings.aica.LimitFPS);
} }
} }

2
core/oslib/ds_audiostream.cpp
View File

@ -155,7 +155,7 @@ u32 os_Push_nw(void* frame, u32 samplesb)
//ds_ring_size //ds_ring_size
} }
u32 os_Push(void* frame, u32 samples, bool wait) u32 PushAudio(void* frame, u32 samples, bool wait)
{ {
u16* f=(u16*)frame; u16* f=(u16*)frame;

2
core/sdl/main.cpp
View File

@ -515,7 +515,7 @@ int main(int argc, wchar* argv[])
return 0; return 0;
} }
u32 os_Push(void* frame, u32 samples, bool wait) u32 PushAudio(void* frame, u32 samples, bool wait)
{ {
#ifdef USE_OSS #ifdef USE_OSS
static bool blocking = true; static bool blocking = true;

2
shell/android/jni/src/Android.cpp
View File

@ -485,7 +485,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_initControllers(JNIEn
env->ReleaseBooleanArrayElements(controllers, controllers_body, 0); 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); verify(amt==SAMPLE_COUNT);
//yeah, do some audio piping magic here ! //yeah, do some audio piping magic here !