mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-02 01:56:43 -04:00
Working on file saving, T/R sequencing, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2494 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
96884403db
commit
8af8a0529d
@ -392,6 +392,7 @@ void MainWindow::dataSink(int k)
|
|||||||
static int ndiskdat;
|
static int ndiskdat;
|
||||||
static int nwrite=0;
|
static int nwrite=0;
|
||||||
static int k0=99999999;
|
static int k0=99999999;
|
||||||
|
static int n300z=9999;
|
||||||
static float px=0.0;
|
static float px=0.0;
|
||||||
static float sq0=0.0;
|
static float sq0=0.0;
|
||||||
static float sqave=1000.0;
|
static float sqave=1000.0;
|
||||||
@ -446,20 +447,13 @@ void MainWindow::dataSink(int k)
|
|||||||
splot[i] /= n; //Normalize the average
|
splot[i] /= n; //Normalize the average
|
||||||
}
|
}
|
||||||
|
|
||||||
// Time according to this computer
|
|
||||||
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
|
|
||||||
int n60 = (ms/1000) % 60;
|
|
||||||
if((m_diskData && ihsym <= m_waterfallAvg) || (!m_diskData && n60<n60z)) {
|
|
||||||
for (int i=0; i<NFFT; i++) {
|
|
||||||
splot[i] = 1.e30;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
n60z=n60;
|
|
||||||
n=0;
|
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
// Time according to this computer
|
||||||
|
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
|
||||||
|
int n300 = (ms/100) % 300;
|
||||||
|
|
||||||
if(k >= (int)(29.5*48000) and nwrite==0) {
|
qDebug() << "dataSink" << k << n300 << nwrite;
|
||||||
|
if(n300 >= 295 and nwrite==0) {
|
||||||
nwrite=1;
|
nwrite=1;
|
||||||
if(m_saveAll) {
|
if(m_saveAll) {
|
||||||
QDateTime t = QDateTime::currentDateTimeUtc();
|
QDateTime t = QDateTime::currentDateTimeUtc();
|
||||||
@ -854,7 +848,7 @@ void MainWindow::diskDat() //diskDat()
|
|||||||
|
|
||||||
void MainWindow::diskWriteFinished() //diskWriteFinished
|
void MainWindow::diskWriteFinished() //diskWriteFinished
|
||||||
{
|
{
|
||||||
// qDebug() << "diskWriteFinished";
|
qDebug() << "diskWriteFinished";
|
||||||
}
|
}
|
||||||
//Delete ../save/*.wav
|
//Delete ../save/*.wav
|
||||||
void MainWindow::on_actionDelete_all_wav_files_in_SaveDir_triggered()
|
void MainWindow::on_actionDelete_all_wav_files_in_SaveDir_triggered()
|
||||||
@ -1169,6 +1163,7 @@ void MainWindow::guiUpdate()
|
|||||||
if(!soundOutThread.isRunning()) {
|
if(!soundOutThread.isRunning()) {
|
||||||
soundOutThread.start(QThread::HighPriority);
|
soundOutThread.start(QThread::HighPriority);
|
||||||
}
|
}
|
||||||
|
qDebug() << "PTT raised, soundOut started";
|
||||||
}
|
}
|
||||||
if(!bTxTime || m_txMute) {
|
if(!bTxTime || m_txMute) {
|
||||||
btxok=false;
|
btxok=false;
|
||||||
|
@ -124,7 +124,7 @@ void SoundInThread::run() //SoundInThread::run()
|
|||||||
nBusy++;
|
nBusy++;
|
||||||
} else {
|
} else {
|
||||||
// m_dataSinkBusy=true;
|
// m_dataSinkBusy=true;
|
||||||
// qDebug() << "A" << k;
|
// qDebug() << "Calling dataSink" << k;
|
||||||
emit readyForFFT(k); //Signal to compute new FFTs
|
emit readyForFFT(k); //Signal to compute new FFTs
|
||||||
}
|
}
|
||||||
nstep0=m_step;
|
nstep0=m_step;
|
||||||
|
@ -83,6 +83,7 @@ void SoundOutThread::run()
|
|||||||
}
|
}
|
||||||
const PaStreamInfo* p=Pa_GetStreamInfo(outStream);
|
const PaStreamInfo* p=Pa_GetStreamInfo(outStream);
|
||||||
outputLatency = p->outputLatency;
|
outputLatency = p->outputLatency;
|
||||||
|
qDebug() << "SoundOut started, latency =" << outputLatency;
|
||||||
bool qe = quitExecution;
|
bool qe = quitExecution;
|
||||||
|
|
||||||
//---------------------------------------------- Soundcard output loop
|
//---------------------------------------------- Soundcard output loop
|
||||||
@ -96,6 +97,7 @@ void SoundOutThread::run()
|
|||||||
}
|
}
|
||||||
Pa_StopStream(outStream);
|
Pa_StopStream(outStream);
|
||||||
Pa_CloseStream(outStream);
|
Pa_CloseStream(outStream);
|
||||||
|
qDebug() << "SoundOut terminated";
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundOutThread::setOutputDevice(int n) //setOutputDevice()
|
void SoundOutThread::setOutputDevice(int n) //setOutputDevice()
|
||||||
|
Loading…
Reference in New Issue
Block a user