RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

extracted OSS code to sndout_oss_*, BTN->PBTN, refactoring

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@599 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-10-17 15:29:37 +00:00
parent 725d7f6c16
commit b3972d826f
21 changed files with 386 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gp2x/emu.c
View file

@ -16,12 +16,13 @@
#include "emu.h"
#include "gp2x.h"
#include "usbjoy.h"
#include "menu.h"
#include "../linux/usbjoy.h"
#include "../common/arm_utils.h"
#include "../common/fonts.h"
#include "../common/emu.h"
#include "../common/config.h"
#include "../linux/sndout_oss.h"
#include "cpuctrl.h"
#include <pico/pico_int.h>
@ -487,7 +488,7 @@ static void update_volume(int has_changed, int is_up)
if (vol > 0) vol--;
}
wait_frames = 0;
gp2x_sound_volume(vol, vol);
sndout_oss_setvol(vol, vol);
currentConfig.volume = vol;
}
sprintf(noticeMsg, "VOL: %02i", vol);
@ -614,9 +615,9 @@ static void updateKeys(void)
// add joy inputs
if (num_of_joys > 0)
{
gp2x_usbjoy_update();
usbjoy_update();
for (joy = 0; joy < num_of_joys; joy++) {
int btns = gp2x_usbjoy_check2(joy);
int btns = usbjoy_check2(joy);
for (i = 0; i < 32; i++) {
if (btns & (1 << i)) {
int acts = currentConfig.JoyBinds[joy][i];
@ -662,7 +663,7 @@ static void updateSound(int len)
/* avoid writing audio when lagging behind to prevent audio lag */
if (PicoSkipFrame != 2)
gp2x_sound_write(PsndOut, len<<1);
sndout_oss_write(PsndOut, len<<1);
}
void emu_startSound(void)
@ -683,8 +684,8 @@ void emu_startSound(void)
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
PicoWriteSound = updateSound;
update_volume(0, 0);
memset(sndBuffer, 0, sizeof(sndBuffer));