RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make OSS detect blocking, adjust audio API

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@898 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-09-18 16:40:13 +00:00
parent d40231e29a
commit a4edca53b4
11 changed files with 92 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

33
platform/gp2x/emu.c
View file

@ -710,18 +710,13 @@ void plat_update_volume(int has_changed, int is_up)
}
}
static void updateSound(int len)
static void oss_write_nonblocking(int len)
{
len <<= 1;
if (PicoOpt & POPT_EN_STEREO)
len <<= 1;
// sndout_oss_can_write() is not reliable, only use with no_frmlimit
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
return;
/* avoid writing audio when lagging behind to prevent audio lag */
if (PicoSkipFrame != 2)
sndout_oss_write(PsndOut, len);
sndout_oss_write_nb(PsndOut, len);
}
void pemu_sound_start(void)
@ -739,7 +734,7 @@ void pemu_sound_start(void)
memset(sndBuffer, 0, sizeof(sndBuffer));
PsndOut = sndBuffer;
PicoWriteSound = updateSound;
PicoWriteSound = oss_write_nonblocking;
plat_update_volume(0, 0);
printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
@ -786,30 +781,16 @@ void pemu_sound_wait(void)
void pemu_forced_frame(int no_scale, int do_emu)
{
int po_old = PicoOpt;
PicoOpt &= ~POPT_ALT_RENDERER;
PicoOpt |= POPT_ACC_SPRITES;
if (!no_scale)
PicoOpt |= POPT_EN_SOFTSCALE;
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
PicoDrawSetOutFormat(PDF_RGB555, 1);
doing_bg_frame = 1;
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
PicoDraw32xSetFrameMode(0, 0);
PicoDrawSetCallbacks(NULL, NULL);
Pico.m.dirtyPal = 1;
doing_bg_frame = 1;
if (do_emu)
PicoFrame();
else
PicoFrameDrawOnly();
doing_bg_frame = 0;
emu_cmn_forced_frame(no_scale, do_emu);
g_menubg_src_ptr = g_screen_ptr;
PicoOpt = po_old;
doing_bg_frame = 0;
}
void plat_debug_cat(char *str)