notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix DrawSpritesHiAS
[picodrive.git]
/
platform
/
gp2x
/
940ctl.c
diff --git
a/platform/gp2x/940ctl.c
b/platform/gp2x/940ctl.c
index
6ba13bd
..
c270bfe
100644
(file)
--- a/
platform/gp2x/940ctl.c
+++ b/
platform/gp2x/940ctl.c
@@
-391,7
+391,7
@@
int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
ym_active_chs = shared_ctl->ym_active_chs;
\r
\r
// mix in ym buffer. is_buf_empty means nobody mixed there anything yet and it may contain trash
\r
ym_active_chs = shared_ctl->ym_active_chs;
\r
\r
// mix in ym buffer. is_buf_empty means nobody mixed there anything yet and it may contain trash
\r
- if (is_buf_empty && ym_active_chs) memcpy
32(buffer, ym_buf, length<<stereo
);
\r
+ if (is_buf_empty && ym_active_chs) memcpy
(buffer, ym_buf, length << (stereo + 2)
);
\r
else memset32(buffer, 0, length<<stereo);
\r
\r
if (shared_ctl->writebuffsel == 1) {
\r
else memset32(buffer, 0, length<<stereo);
\r
\r
if (shared_ctl->writebuffsel == 1) {
\r
@@
-402,9
+402,9
@@
int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
writebuff_ptr = 0;
\r
\r
/* predict sample counter for next frame */
\r
writebuff_ptr = 0;
\r
\r
/* predict sample counter for next frame */
\r
- if (P
sndLen_exc
_add) {
\r
- length = P
sndL
en;
\r
- if (P
sndLen_exc_cnt + PsndLen_exc
_add >= 0x10000) length++;
\r
+ if (P
ico.snd.len_e
_add) {
\r
+ length = P
ico.snd.l
en;
\r
+ if (P
ico.snd.len_e_cnt + Pico.snd.len_e
_add >= 0x10000) length++;
\r
}
\r
\r
/* give 940 ym job */
\r
}
\r
\r
/* give 940 ym job */
\r
@@
-424,7
+424,7
@@
int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
\r
int mp3dec_decode(FILE *f, int *file_pos, int file_len)
\r
{
\r
\r
int mp3dec_decode(FILE *f, int *file_pos, int file_len)
\r
{
\r
- if (!(Pico
O
pt & POPT_EXT_FM)) {
\r
+ if (!(Pico
In.o
pt & POPT_EXT_FM)) {
\r
//mp3_update_local(buffer, length, stereo);
\r
return 0;
\r
}
\r
//mp3_update_local(buffer, length, stereo);
\r
return 0;
\r
}
\r
@@
-456,18
+456,18
@@
int mp3dec_decode(FILE *f, int *file_pos, int file_len)
\r
int mp3dec_start(FILE *f, int fpos_start)
\r
{
\r
\r
int mp3dec_start(FILE *f, int fpos_start)
\r
{
\r
- if (!(Pico
O
pt & POPT_EXT_FM)) {
\r
+ if (!(Pico
In.o
pt & POPT_EXT_FM)) {
\r
//mp3_start_play_local(f, pos);
\r
return -1;
\r
}
\r
\r
if (loaded_mp3 != f)
\r
{
\r
//mp3_start_play_local(f, pos);
\r
return -1;
\r
}
\r
\r
if (loaded_mp3 != f)
\r
{
\r
- if (PicoMessage != NULL)
\r
+ if (Pico
In.osd
Message != NULL)
\r
{
\r
fseek(f, 0, SEEK_END);
\r
if (ftell(f) > 2*1024*1024)
\r
{
\r
fseek(f, 0, SEEK_END);
\r
if (ftell(f) > 2*1024*1024)
\r
- PicoMessage("Loading MP3...");
\r
+ Pico
In.osd
Message("Loading MP3...");
\r
}
\r
fseek(f, 0, SEEK_SET);
\r
fread(mp3_mem, 1, MP3_SIZE_MAX, f);
\r
}
\r
fseek(f, 0, SEEK_SET);
\r
fread(mp3_mem, 1, MP3_SIZE_MAX, f);
\r