Call the MSK144 short-message decoder only if "Sh" is checked. Also,

make ntol available to the MSK144 decoder.  


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6894 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2016-07-08 14:42:28 +00:00
parent 49cc27ce26
commit 6d2e974b8d
6 changed files with 18 additions and 14 deletions
+5 -4
View File
@@ -105,9 +105,9 @@ extern "C" {
float* level, float* sigdb, float* snr, float* dfreq,
float* width);
void fast_decode_(short id2[], int narg[], char msg[], char pchkFile[],
char mycall[], char hiscall[], int len1, int len2,
int len3, int len4);
void fast_decode_(short id2[], int narg[], bool* bShMsgs, char msg[],
char pchkFile[], char mycall[], char hiscall[],
int len1, int len2, int len3, int len4);
void hash_calls_(char calls[], int* ih9, int len);
void degrade_snr_(short d2[], int* n, float* db, float* bandwidth);
void wav12_(short d2[], short d1[], int* nbytes, short* nbitsam2);
@@ -2207,7 +2207,7 @@ void MainWindow::decode() //decode()
narg[14]=m_config.aggressive();
memcpy(d2b,dec_data.d2,2*360000);
watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0],
&narg[0],&m_msg[0][0],&m_pchkFile[0],dec_data.params.mycall,
&narg[0],&m_bShMsgs,&m_msg[0][0],&m_pchkFile[0],dec_data.params.mycall,
dec_data.params.hiscall,80,512,12,12)));
} else {
memcpy(to, from, qMin(mem_jt9->size(), size));
@@ -3975,6 +3975,7 @@ void MainWindow::on_actionMSK144_triggered()
m_toneSpacing=0.0;
ui->cbShMsgs->setChecked(false);
ui->cbShMsgs->setVisible(true);
// ui->sbFtol->setVisible(false); //Maybe?
ui->actionMSK144->setChecked(true);
}