From: David Griffith <dave@661.org>
Date: Tue, 31 Dec 2013 06:16:00 +0000 (-0800)
Subject: Trying cutting over to the AIFF instead of mixing it with the OGG.
X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=fde00e7efc18599c31e202a96cf9a32a6a14926d;p=liskon_frotz.git

Trying cutting over to the AIFF instead of mixing it with the OGG.
---

diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index c1a9473..51a163f 100644
--- a/src/curses/ux_audio.c
+++ b/src/curses/ux_audio.c
@@ -789,7 +789,7 @@ static int playogg(FILE *fp, bb_result_t result, int vol, int repeats)
 		fread((void *)&myinfo, sizeof(SOUNDFX), 1, pipefile);
 	        header = 1;
 	    }
-	    pipe_frames_read = fread((void *)floatbuffer2, sizeof(float),
+	    pipe_frames_read = fread((void *)floatbuffer, sizeof(float),
 				BUFFSIZE, pipefile);
 
 	    if (pipe_frames_read != BUFFSIZE)
@@ -801,7 +801,8 @@ static int playogg(FILE *fp, bb_result_t result, int vol, int repeats)
 	for (volcount = 0; volcount <= frames_read / 2; volcount++) {
 	    ((float *) floatbuffer)[volcount] /= volfactor;
 	    if (poll_ret > 0) {
-		((float *) floatbuffer)[volcount] += ntohs(((float *) floatbuffer2)[volcount]);
+//		floatbuffer[volcount] = ntohs(floatbuffer[volcount]);
+//		floatbuffer[volcount] += ntohs(((float *) floatbuffer2)[volcount]);
 	    }
 	}
 	floattopcm16(buffer, floatbuffer, frames_read);