Reintegrate Joe's experimental VHF & up features

As at ^/branches/wsjtx_exp@5271



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2015-04-22 17:48:03 +00:00
parent 854ed43d22
commit 3430648727
108 changed files with 7203 additions and 5099 deletions
+27 -4
View File
@@ -18,6 +18,21 @@
void getfile(QString fname, int ntrperiod)
{
struct WAVHDR {
char ariff[4];
int lenfile;
char awave[4];
char afmt[4];
int lenfmt;
short nfmt2;
short nchan2;
int nsamrate;
int nbytesec;
short nbytesam2;
short nbitsam2;
char adata[4];
int ndata;
} hdr;
char name[512];
strncpy(name,fname.toLatin1(), sizeof (name) - 1);
@@ -25,17 +40,25 @@ void getfile(QString fname, int ntrperiod)
FILE* fp=fopen(name,"rb");
int i0=fname.indexOf(".wav");
int i1=fname.lastIndexOf("/");
QString baseName=fname.mid(i1+1);
// qDebug() << baseName << baseName.length();
int i0=fname.indexOf(".wav",0,Qt::CaseInsensitive);
jt9com_.nutc=0;
if(i0>0) jt9com_.nutc=100*fname.mid(i0-4,2).toInt() +
fname.mid(i0-2,2).toInt();
if(i0>0) {
int n=4;
if(baseName.length()!=15) n=6;
jt9com_.nutc=100*fname.mid(i0-n,2).toInt() + fname.mid(i0-n+2,2).toInt();
}
int npts=ntrperiod*12000;
memset(jt9com_.d2,0,2*npts);
if(fp != NULL) {
// Read (and ignore) a 44-byte WAV header; then read data
int n=fread(jt9com_.d2,1,44,fp);
int n=fread(&hdr,1,44,fp);
n=fread(jt9com_.d2,2,npts,fp);
if(hdr.nsamrate==11025) wav12_(jt9com_.d2,jt9com_.d2,&n,&hdr.nbitsam2);
fclose(fp);
jt9com_.newdat=1;
if(n==-99999) jt9com_.newdat=2; //Silence compiler warning