From fe52354af90419183aedad1a4abafe20a1a7bc1b Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal@whence.com>
Date: Mon, 30 May 2011 10:21:16 -0700
Subject: [PATCH] minimodem fix bugged shift calcs

---
 src/minimodem.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/minimodem.c b/src/minimodem.c
index bf16a4a..36dd1a2 100644
--- a/src/minimodem.c
+++ b/src/minimodem.c
@@ -273,8 +273,8 @@ reprocess_audio:
 
 	    if ( nframes == nsamples ) {
 #if  1
-		/* shift by 1/2 the width of one data bit */
-// any of these could work ...
+		/* shift by a fraction of the width of one data bit
+		 * any of these could work ... */
 //		nframes = nsamples / 2;
 //		nframes = nsamples / 4;
 //		nframes = nsamples / 8;
@@ -293,14 +293,23 @@ reprocess_audio:
 	    if ( nframes ) {
 		size_t	framesize = nchannels * sizeof(float);
 		size_t	nbytes = nframes * framesize;
-		size_t	reuse_bytes = nsamples*framesize - nbytes;
-		memmove(fftin, fftin+nbytes, reuse_bytes);
-		void *in = fftin + reuse_bytes;
-
+		size_t	reuse_bytes = (nsamples-nframes)*framesize;
+		void *in = fftin;
+		memmove(in, in+nbytes, reuse_bytes);
+		in += reuse_bytes;
+		/* read samples directly into fftin */
 		if ((ret=simpleaudio_read(sa, in, nframes)) <= 0)
 		    break;
-
 		carrier_nsamples += nframes;
+
+	if ( textscope ) {
+	    int one_line_mode = 0;
+	    int show_maxmag = 1;
+	    tscope_print(fftout, show_nbands, magscalar,
+				one_line_mode, show_maxmag);
+	    printf("\n");
+	}
+
 		goto reprocess_audio;
 	    }
 	}