From: notaz <notasas@gmail.com>
Date: Sat, 20 Dec 2014 00:09:29 +0000 (+0200)
Subject: libretro: update for newer spu code
X-Git-Tag: r20~25
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db1262095fed1b02260cc4ae4a42cdd31b8ef0a4;p=pcsx_rearmed.git

libretro: update for newer spu code

- no sample counting needed now
- add a callback check
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index c14f00fe..524aedff 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -39,7 +39,6 @@ static int vout_doffs_old, vout_fb_dirty;
 static bool vout_can_dupe;
 static bool duping_enable;
 
-static int samples_sent, samples_to_send;
 static int plugins_opened;
 static int is_pal_mode;
 
@@ -216,16 +215,13 @@ static void snd_finish(void)
 
 static int snd_busy(void)
 {
-	if (samples_to_send > samples_sent)
-		return 0; /* give more samples */
-	else
-		return 1;
+	return 0;
 }
 
 static void snd_feed(void *buf, int bytes)
 {
-	audio_batch_cb(buf, bytes / 4);
-	samples_sent += bytes / 4;
+	if (audio_batch_cb != NULL)
+		audio_batch_cb(buf, bytes / 4);
 }
 
 void out_register_libretro(struct out_driver *drv)
@@ -1088,8 +1084,6 @@ void retro_run(void)
 	stop = 0;
 	psxCpu->Execute();
 
-	samples_to_send += is_pal_mode ? 44100 / 50 : 44100 / 60;
-
 	video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf : NULL,
 		vout_width, vout_height, vout_width * 2);
 	vout_fb_dirty = 0;