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

cue/bin finally implemented

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@434 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-05-01 20:47:09 +00:00
parent 9fe01b9693
commit c985b45a6a
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/mp3_helix.c
View file

@ -11,7 +11,6 @@
#include "helix/pub/mp3dec.h" #include "helix/pub/mp3dec.h"
#include "lprintf.h" #include "lprintf.h"
static short mp3_out_buffer[2*1152];
static HMP3Decoder mp3dec = 0; static HMP3Decoder mp3dec = 0;
static int mp3_buffer_offs = 0; static int mp3_buffer_offs = 0;
@ -94,7 +93,7 @@ static int mp3_decode(void)
readPtr += offset; readPtr += offset;
bytesLeft -= offset; bytesLeft -= offset;
err = MP3Decode(mp3dec, &readPtr, &bytesLeft, mp3_out_buffer, 0); err = MP3Decode(mp3dec, &readPtr, &bytesLeft, cdda_out_buffer, 0);
if (err) { if (err) {
if (err == ERR_MP3_INDATA_UNDERFLOW) { if (err == ERR_MP3_INDATA_UNDERFLOW) {
shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF
@ -119,7 +118,7 @@ void mp3_start_local(void)
#define mp3_update mp3_update_local #define mp3_update mp3_update_local
#else #else // !__GP2X__
static FILE *mp3_current_file = NULL; static FILE *mp3_current_file = NULL;
static int mp3_file_len = 0, mp3_file_pos = 0; static int mp3_file_len = 0, mp3_file_pos = 0;
@ -148,7 +147,7 @@ static int mp3_decode(void)
readPtr = mp3_input_buffer + offset; readPtr = mp3_input_buffer + offset;
bytesLeft -= offset; bytesLeft -= offset;
err = MP3Decode(mp3dec, &readPtr, &bytesLeft, mp3_out_buffer, 0); err = MP3Decode(mp3dec, &readPtr, &bytesLeft, cdda_out_buffer, 0);
if (err) { if (err) {
//lprintf("MP3Decode err (%i/%i) %i\n", mp3_file_pos, mp3_file_len, err); //lprintf("MP3Decode err (%i/%i) %i\n", mp3_file_pos, mp3_file_len, err);
if (err == ERR_MP3_INDATA_UNDERFLOW) { if (err == ERR_MP3_INDATA_UNDERFLOW) {
@ -232,17 +231,17 @@ void mp3_update(int *buffer, int length, int stereo)
else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; length_mp3 <<= 2; shr = 2; } else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; length_mp3 <<= 2; shr = 2; }
if (1152 - mp3_buffer_offs >= length_mp3) { if (1152 - mp3_buffer_offs >= length_mp3) {
mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, length<<1); mix_samples(buffer, cdda_out_buffer + mp3_buffer_offs*2, length<<1);
mp3_buffer_offs += length_mp3; mp3_buffer_offs += length_mp3;
} else { } else {
int ret, left = 1152 - mp3_buffer_offs; int ret, left = 1152 - mp3_buffer_offs;
mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, (left>>shr)<<1); mix_samples(buffer, cdda_out_buffer + mp3_buffer_offs*2, (left>>shr)<<1);
ret = mp3_decode(); ret = mp3_decode();
if (ret == 0) { if (ret == 0) {
mp3_buffer_offs = length_mp3 - left; mp3_buffer_offs = length_mp3 - left;
mix_samples(buffer + ((left>>shr)<<1), mp3_out_buffer, (mp3_buffer_offs>>shr)<<1); mix_samples(buffer + ((left>>shr)<<1), cdda_out_buffer, (mp3_buffer_offs>>shr)<<1);
} else } else
mp3_buffer_offs = 0; mp3_buffer_offs = 0;
} }

2
gp2x/Makefile
View file

@ -73,6 +73,8 @@ OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pi
../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/cue.o ../../Pico/cd/gfx_cd.o \ ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/cue.o ../../Pico/cd/gfx_cd.o \
../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
endif endif
# Pico - Pico
OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o
# Pico - carthw # Pico - carthw
OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \ OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \
../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o

6
linux/940ctl_ym2612.c
View file

@ -205,9 +205,3 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
} }
int mp3_get_offset(void)
{
return 0;
}