w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-04-14 07:19:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove lots more unneeded stuff.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-10 18:13:36 -05:00
parent 33382c1c88
commit dc23772f9e
4 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
q65w/devsetup.h
View File

@ -14,12 +14,6 @@ public:
void initDlg();
qint32 m_idInt;
qint32 m_pttPort;
qint32 m_nDevIn;
qint32 m_nDevOut;
qint32 m_inDevList[100];
qint32 m_outDevList[100];
qint32 m_paInDevice;
qint32 m_paOutDevice;
qint32 m_timeout;
qint32 m_dPhi;
qint32 m_fCal;

13
q65w/mainwindow.cpp
View File

@ -139,7 +139,6 @@ MainWindow::MainWindow(QWidget *parent) :
connect(&watcher3, SIGNAL(finished()),this,SLOT(decoderFinished()));
// Assign input device and start input thread
soundInThread.setInputDevice(m_paInDevice);
soundInThread.setRate(96000.0);
soundInThread.setBufSize(10*7056);
soundInThread.setNetwork(m_network);
@ -277,10 +276,8 @@ void MainWindow::readSettings()
m_network = settings.value("NetworkInput",true).toBool();
m_fs96000 = settings.value("FSam96000",true).toBool();
m_nDevIn = settings.value("SoundInIndex", 0).toInt();
m_paInDevice = settings.value("paInDevice",0).toInt();
m_dB = settings.value("Scale_dB",0).toInt();
m_udpPort = settings.value("UDPport",50004).toInt();
soundInThread.setSwapIQ(0); //###
soundInThread.setScale(m_dB);
soundInThread.setPort(m_udpPort);
ui->actionCuteSDR->setChecked(settings.value(
@ -465,8 +462,6 @@ void MainWindow::on_actionSettings_triggered()
dlg.m_fAdd=m_fAdd;
dlg.m_network=m_network;
dlg.m_fs96000=m_fs96000;
dlg.m_nDevIn=m_nDevIn;
dlg.m_nDevOut=m_nDevOut;
dlg.m_udpPort=m_udpPort;
dlg.m_dB=m_dB;
dlg.initDlg();
@ -486,9 +481,6 @@ void MainWindow::on_actionSettings_triggered()
m_wide_graph_window->setFcal(m_fCal);
m_fs96000=dlg.m_fs96000;
m_network=dlg.m_network;
m_nDevIn=dlg.m_nDevIn;
m_paInDevice=dlg.m_paInDevice;
m_nDevOut=dlg.m_nDevOut;
m_udpPort=dlg.m_udpPort;
m_dB=dlg.m_dB;
soundInThread.setScale(m_dB);
@ -500,7 +492,6 @@ void MainWindow::on_actionSettings_triggered()
soundInThread.setRate(96000.0);
soundInThread.setFadd(m_fAdd);
soundInThread.setNrx(1);
soundInThread.setInputDevice(m_paInDevice);
soundInThread.start(QThread::HighestPriority);
}
}
@ -987,8 +978,8 @@ void MainWindow::guiUpdate()
if(nsec != m_sec0) { //Once per second
// qDebug() << "AAA" << nsec%60 << decodes_.ndecodes << decodes_.ncand;
soundInThread.setForceCenterFreqMHz(m_wide_graph_window->m_dForceCenterFreq);
soundInThread.setForceCenterFreqBool(m_wide_graph_window->m_bForceCenterFreq);
// soundInThread.setForceCenterFreqMHz(m_wide_graph_window->m_dForceCenterFreq);
// soundInThread.setForceCenterFreqBool(m_wide_graph_window->m_bForceCenterFreq);
if(m_pctZap>30.0) {
lab4->setStyleSheet("QLabel{background-color: #ff0000}");

28
q65w/soundin.cpp
View File

@ -79,11 +79,6 @@ void SoundInThread::run() //SoundInThread::run()
}
}
void SoundInThread::setSwapIQ(bool b)
{
m_IQswap=b;
}
void SoundInThread::setScale(qint32 n)
{
m_dB=n;
@ -94,12 +89,6 @@ void SoundInThread::setPort(int n) //setPort()
this->m_udpPort=n;
}
void SoundInThread::setInputDevice(int n) //setInputDevice()
{
if (isRunning()) return;
this->m_nDevIn=n;
}
void SoundInThread::setRate(double rate) //setRate()
{
if (isRunning()) return;
@ -133,17 +122,6 @@ void SoundInThread::setMonitoring(bool b) //setMonitoring()
m_monitoring = b;
}
void SoundInThread::setForceCenterFreqBool(bool b)
{
m_bForceCenterFreq=b;
}
void SoundInThread::setForceCenterFreqMHz(double d)
{
m_dForceCenterFreq=d;
}
void SoundInThread::setNrx(int n) //setNrx()
{
m_nrx = n;
@ -232,11 +210,7 @@ void SoundInThread::inputUDP()
if ((k+iz) <= 60*96000) {
int nsam=-1;
recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8, b.d8);
if(m_bForceCenterFreq) {
datcom_.fcenter=m_dForceCenterFreq;
} else {
datcom_.fcenter=b.cfreq + m_fAdd;
}
datcom_.fcenter=b.cfreq + m_fAdd;
}
m_hsym=(k-2048)*11025.0/(2048.0*m_rate);

8
q65w/soundin.h
View File

@ -29,18 +29,14 @@ public:
{
}
void setSwapIQ(bool b);
void setScale(qint32 n);
void setPort(qint32 n);
void setInputDevice(qint32 n);
void setRate(double rate);
void setBufSize(unsigned bufSize);
void setNetwork(bool b);
void setMonitoring(bool b);
void setFadd(double x);
void setNrx(int n);
void setForceCenterFreqBool(bool b);
void setForceCenterFreqMHz(double d);
void setPeriod(int n);
int nrx();
int mhsym();
@ -60,12 +56,8 @@ private:
double m_fAdd;
bool m_net;
bool m_monitoring;
bool m_bForceCenterFreq;
bool m_IQswap;
double m_dForceCenterFreq;
qint32 m_nrx;
qint32 m_hsym;
qint32 m_nDevIn;
qint32 m_udpPort;
qint32 m_TRperiod;
qint32 m_TRperiod0;