From d2b0fc27a33226ec303819b6d26fcdf6b66fd904 Mon Sep 17 00:00:00 2001
From: Ed Gonzalez <ed.gonzalez@flex-radio.com>
Date: Thu, 5 Feb 2015 11:29:02 -0600
Subject: [PATCH] Revert "Add reliable_sync_bit to FreeDV structure and handle
 audio passthrough in sched_waveform"

This reverts commit a14898a070451b194c31f10d9fc8103cb75b80d8.
---
 DSP_API/CODEC2_FREEDV/freedv_api.c          |  2 +-
 DSP_API/CODEC2_FREEDV/freedv_api.h          |  2 --
 DSP_API/SmartSDR_Interface/sched_waveform.c | 21 ++++++++-------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/DSP_API/CODEC2_FREEDV/freedv_api.c b/DSP_API/CODEC2_FREEDV/freedv_api.c
index 194686f..a5f9c19 100644
--- a/DSP_API/CODEC2_FREEDV/freedv_api.c
+++ b/DSP_API/CODEC2_FREEDV/freedv_api.c
@@ -303,7 +303,7 @@ int freedv_rx(struct freedv *f, short speech_out[], short demod_in[]) {
     nin_prev = f->nin;
     fdmdv_demod(f->fdmdv, f->fdmdv_bits, &reliable_sync_bit, rx_fdm, &f->nin);
     fdmdv_get_demod_stats(f->fdmdv, &f->fdmdv_stats);
-    f->reliable_sync_bit = reliable_sync_bit;
+
     if (f->fdmdv_stats.sync) {
         if (reliable_sync_bit == 0) {
             memcpy(f->rx_bits, f->fdmdv_bits, bits_per_fdmdv_frame*sizeof(int));
diff --git a/DSP_API/CODEC2_FREEDV/freedv_api.h b/DSP_API/CODEC2_FREEDV/freedv_api.h
index 8f4e6c7..5b48cbf 100644
--- a/DSP_API/CODEC2_FREEDV/freedv_api.h
+++ b/DSP_API/CODEC2_FREEDV/freedv_api.h
@@ -65,8 +65,6 @@ struct freedv {
 
     void                *callback_state;
 
-    int 				reliable_sync_bit;
-
 };
 
 struct freedv *freedv_open(int mode);
diff --git a/DSP_API/SmartSDR_Interface/sched_waveform.c b/DSP_API/SmartSDR_Interface/sched_waveform.c
index 7aaf70f..b7d207c 100644
--- a/DSP_API/SmartSDR_Interface/sched_waveform.c
+++ b/DSP_API/SmartSDR_Interface/sched_waveform.c
@@ -263,7 +263,7 @@ static void* _sched_waveform_thread(void* param)
 
     int		i;			// for loop counter
     float	fsample;	// a float sample
-    float   Sig2Noise;	// Signal to noise ratio
+//    float   Sig2Noise;	// Signal to noise ratio
 
     // Flags ...
     int		initial_tx = 1; 			// Flags for TX circular buffer, clear if starting transmit
@@ -457,18 +457,13 @@ static void* _sched_waveform_thread(void* param)
 
 								nout = freedv_rx(_freedvS, speech_out, demod_in);
 
+	//							if(nout != 320 ) {
+	//								output("NOUT not 320 it is %d\nNIN was %d\n", nout, nin);
+	//							}
 
-
-								if ( nout == nin && _freedvS->reliable_sync_bit ){
-									for( i=0 ; i < nout ; i++)
-									{
-										cbWriteShort(RX3_cb, speech_out[i]);
-									}
-								} else {
-
-									for ( i = 0; i < nin ; i ++ ) {
-										cbWriteShort(RX3_cb, demod_in[i]);
-									}
+								for( i=0 ; i < nout ; i++)
+								{
+									cbWriteShort(RX3_cb, speech_out[i]);
 								}
 							}
 	//						} else {
@@ -492,7 +487,7 @@ static void* _sched_waveform_thread(void* param)
 							{
 								cbWriteFloat(RX4_cb, float_out_24k[i]);
 							}
-							Sig2Noise = (_freedvS->fdmdv_stats.snr_est);
+							//Sig2Noise = (_freedvS->fdmdv_stats.snr_est);
 						}
 
 						// Check for >= 128 samples in RX4_cb. Form packet and