Merging code for v1.1 back into the main wsjtx branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

soundin.cpp

@@ -2,7 +2,8 @@
 #include <stdexcept>
 
 #define FRAMES_PER_BUFFER 1024
-#define NSMAX 1365
+//#define NSMAX 1365
+#define NSMAX 6827
 #define NTMAX 120
 
 extern "C" {
@@ -10,7 +11,7 @@ extern "C" {
 extern struct {
   float ss[184*NSMAX];              //This is "common/jt9com/..." in fortran
   float savg[NSMAX];
-  float c0[2*NTMAX*1500];
+//  float c0[2*NTMAX*1500];
   short int d2[NTMAX*12000];
   int nutc;                         //UTC as integer, HHMM
   int ndiskdat;                     //1 ==> data read from *.wav file
@@ -26,8 +27,8 @@ extern struct {
   int nsave;
   int nagain;
   int ndepth;
-  int nrxlog;
-  int nfsample;
+  int ntxmode;
+  int nmode;
   char datetime[20];
 } jt9com_;
 }
@@ -60,7 +61,7 @@ extern "C" int a2dCallback( const void *inputBuffer, void *outputBuffer,
 
   udata->ncall++;
   if( (statusFlags&paInputOverflow) != 0) {
-    qDebug() << "Input Overflow";
+    qDebug() << "Input Overflow in a2dCallback";
   }
   if(udata->bzero) {           //Start of a new Rx sequence
     udata->kin=0;              //Reset buffer pointer