X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl.c;h=c270bfeea77ca49dfffe9de5fb1a2b3c42265594;hb=ee3c39efd2cf51cd654b6240f6fb595673f10f45;hp=6ba13bd88489cb086a676948dea66684807963f8;hpb=2d6460655c774462193bbc893dce5a43e04b4ed7;p=picodrive.git

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 6ba13bd..c270bfe 100644
--- 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;
 
 	// mix in ym buffer. is_buf_empty means nobody mixed there anything yet and it may contain trash
-	if (is_buf_empty && ym_active_chs) memcpy32(buffer, ym_buf, length<<stereo);
+	if (is_buf_empty && ym_active_chs) memcpy(buffer, ym_buf, length << (stereo + 2));
 	else memset32(buffer, 0, length<<stereo);
 
 	if (shared_ctl->writebuffsel == 1) {
@@ -402,9 +402,9 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
 	writebuff_ptr = 0;
 
 	/* predict sample counter for next frame */
-	if (PsndLen_exc_add) {
-		length = PsndLen;
-		if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length++;
+	if (Pico.snd.len_e_add) {
+		length = Pico.snd.len;
+		if (Pico.snd.len_e_cnt + Pico.snd.len_e_add >= 0x10000) length++;
 	}
 
 	/* give 940 ym job */
@@ -424,7 +424,7 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
 
 int mp3dec_decode(FILE *f, int *file_pos, int file_len)
 {
-	if (!(PicoOpt & POPT_EXT_FM)) {
+	if (!(PicoIn.opt & POPT_EXT_FM)) {
 		//mp3_update_local(buffer, length, stereo);
 		return 0;
 	}
@@ -456,18 +456,18 @@ int mp3dec_decode(FILE *f, int *file_pos, int file_len)
 
 int mp3dec_start(FILE *f, int fpos_start)
 {
-	if (!(PicoOpt & POPT_EXT_FM)) {
+	if (!(PicoIn.opt & POPT_EXT_FM)) {
 		//mp3_start_play_local(f, pos);
 		return -1;
 	}
 
 	if (loaded_mp3 != f)
 	{
-		if (PicoMessage != NULL)
+		if (PicoIn.osdMessage != NULL)
 		{
 			fseek(f, 0, SEEK_END);
 			if (ftell(f) > 2*1024*1024)
-				PicoMessage("Loading MP3...");
+				PicoIn.osdMessage("Loading MP3...");
 		}
 		fseek(f, 0, SEEK_SET);
 		fread(mp3_mem, 1, MP3_SIZE_MAX, f);