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

giz rc1 release

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@268 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-10-04 21:14:45 +00:00
parent 50cdcf97de
commit 11f4e72292
6 changed files with 270 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gp2x/940ctl.c
View file

@ -14,7 +14,7 @@
#include "gp2x.h"
#include "emu.h"
#include "menu.h"
#include "mp3.h"
#include "../common/mp3.h"
#include "../common/arm_utils.h"
#include "../common/menu.h"
#include "../common/emu.h"
@ -533,9 +533,8 @@ void mp3_update(int *buffer, int length, int stereo)
int length_mp3;
int cdda_on;
// not data track, CDC is reading, playback was started, track not ended
cdda_on = !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1) &&
loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
// playback was started, track not ended
cdda_on = loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
if (!cdda_on) return;
@ -649,7 +648,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
int mp3_get_offset(void)
{
int offs1024 = 0;
unsigned int offs1024 = 0;
int cdda_on;
cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
@ -657,10 +656,9 @@ int mp3_get_offset(void)
if (cdda_on) {
offs1024 = shared_ctl->mp3_offs << 7;
offs1024 /= shared_ctl->mp3_len;
offs1024 <<= 3;
offs1024 /= shared_ctl->mp3_len >> 3;
}
printf("offs1024=%i (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);
printf("offs1024=%u (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);
return offs1024;
}