mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-27 06:38:44 -05:00
Bugfixes:
Detector no longer collects samples when transmitting or not monitoring. This was causingissues with the waterfall after tx periods and was a waste of CPU cycles. Correct the missing window title on the waterfall window. Stop and restart the output audio stream if the configuration of device or channels changes in the setup dialog. This defect was causing spurious transmissions after changing configuration. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3543 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
b6559fae7c
commit
3bd43db55c
@ -37,6 +37,8 @@ void Detector::clear ()
|
||||
|
||||
qint64 Detector::writeData (char const * data, qint64 maxSize)
|
||||
{
|
||||
if (m_monitoring)
|
||||
{
|
||||
Q_ASSERT (!(maxSize % static_cast<qint64> (bytesPerFrame ()))); // no torn frames
|
||||
|
||||
qint64 framesAcceptable (sizeof (jt9com_.d2) / sizeof (jt9com_.d2[0]) - jt9com_.kin);
|
||||
@ -75,6 +77,11 @@ qint64 Detector::writeData (char const * data, qint64 maxSize)
|
||||
{
|
||||
m_starting = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
jt9com_.kin = 0;
|
||||
}
|
||||
|
||||
return maxSize; // we drop any data past the end of
|
||||
// the buffer on the floor until the
|
||||
|
@ -216,7 +216,8 @@ void DevSetup::accept()
|
||||
// Check to see whether SoundInThread must be restarted,
|
||||
// and save user parameters.
|
||||
|
||||
m_restartSoundIn = m_restartSoundOut = false;
|
||||
m_restartSoundIn = false;
|
||||
m_restartSoundOut = false;
|
||||
|
||||
if (m_audioInputDevice != m_audioInputDevices[ui->comboBoxSndIn->currentIndex ()])
|
||||
{
|
||||
|
@ -822,7 +822,8 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
|
||||
}
|
||||
|
||||
if(dlg.m_restartSoundOut) {
|
||||
transmit ();
|
||||
Q_EMIT stopAudioOutputStream ();
|
||||
Q_EMIT startAudioOutputStream (m_audioOutputDevice, AudioDevice::Mono == m_audioOutputChannel ? 1 : 2);
|
||||
}
|
||||
}
|
||||
m_catEnabled=dlg.m_catEnabled;
|
||||
|
@ -9,14 +9,13 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
|
||||
ui(new Ui::WideGraph),
|
||||
m_settings (settings)
|
||||
{
|
||||
installEventFilter (parent);
|
||||
ui->setupUi(this);
|
||||
|
||||
setWindowTitle ("Wide Graph");
|
||||
setWindowFlags (Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint);
|
||||
setMaximumWidth (MAX_SCREENSIZE);
|
||||
setMaximumHeight (880);
|
||||
|
||||
ui->setupUi(this);
|
||||
ui->widePlot->setCursor(Qt::CrossCursor);
|
||||
ui->widePlot->setMaximumHeight(800);
|
||||
ui->widePlot->m_bCurrent=false;
|
||||
|
Loading…
Reference in New Issue
Block a user