From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Mon, 3 Aug 2015 00:27:57 +0000 (+0000)
Subject: small tweaks to work with Jim's freedv API changes.  Requires more work to do so... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3a431a5f488e5e2098760367b2eabc3e6fd7389c;p=freetel-svn-tracking.git

small tweaks to work with Jim's freedv API changes.  Requires more work to do so elegantly (ie use the new API calls rather than digging into the structure), but freedv GUI program is building and working

git-svn-id: https://svn.code.sf.net/p/freetel/code@2250 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt
index 73b276aa..da26ffe4 100644
--- a/fdmdv2-dev/README.txt
+++ b/fdmdv2-dev/README.txt
@@ -188,10 +188,11 @@ TODO
         + clue: only when analog not pressed
         + this was 7.5 to 8kHz interpolator bug
     [X] spectrum and waterfall scale changes when analog pressed
-    [ ] ocassional test frames error counter goes crazy
+    [X] ocassional test frames error counter goes crazy
     [ ] 700 syncs up to 1000Hz sine waves
         + shouldn't trigger sync logic, will be a problem with carriers
     [ ] "clip" led, encourage people to adjust gain to hit that occ when speaking
+    [ ] Win32 record from radio time
 
 [ ] FreeDV 700 improvements
     [ ] bpf filter after clipping to remove clicks
@@ -232,7 +233,7 @@ TODO
             + still not real obvious on plot
             + might be useful to make this switchable
     [X] scatter diagram different colours/carrier
-    [ ] remember what mode you were in
+    [X] remember what mode you were in
     [ ] cmd line file decode
     [ ] Waterfall direction
     [ ] documentation or use, walk through, you tube, blog posts
diff --git a/fdmdv2-dev/src/fdmdv2_defines.h b/fdmdv2-dev/src/fdmdv2_defines.h
index 8c2c5d1d..64aa606d 100644
--- a/fdmdv2-dev/src/fdmdv2_defines.h
+++ b/fdmdv2-dev/src/fdmdv2_defines.h
@@ -23,6 +23,7 @@
 
 #include "wx/wx.h"
 #include "freedv_api.h"
+#include "freedv_api_internal.h"
 
 // Spectrogram and Waterfall
 
diff --git a/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp b/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
index d3a29abd..4a8b4473 100644
--- a/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
@@ -356,8 +356,8 @@ void PlotWaterfall::plotPixelData()
     m_max_mag = BETA*m_max_mag + (1 - BETA)*max_mag;
     m_min_mag = max_mag - 20.0;
     //printf("max_mag: %f m_max_mag: %f\n", max_mag, m_max_mag);
-    //intensity_per_dB  = (float)256 /(MAX_MAG_DB - MIN_MAG_DB);
-    intensity_per_dB  = (float)256 /(m_max_mag - m_min_mag);
+    intensity_per_dB  = (float)256 /(MAX_MAG_DB - MIN_MAG_DB);
+    //intensity_per_dB  = (float)256 /(m_max_mag - m_min_mag);
     spec_index_per_px = ((float)(MAX_F_HZ)/(float)m_modem_stats_max_f_hz)*(float)MODEM_STATS_NSPEC / (float) m_rGrid.GetWidth();
 
     /*