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

Simplify MainWindows to Modulator communications.

Browse Source 
No longer any need to have a mute mechanism since the TX shutdown
mechanism is sufficient.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4012 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2014-04-11 22:50:22 +00:00
parent a611d86676
commit fc1713e9bf
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+3 -9
View File
@@ -138,7 +138,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
connect (this, &MainWindow::outAttenuationChanged, &m_soundOutput, &SoundOutput::setAttenuation);
// hook up Modulator slots
connect (this, &MainWindow::muteAudioOutput, &m_modulator, &Modulator::mute);
connect (this, &MainWindow::transmitFrequency, &m_modulator, &Modulator::setFrequency);
connect (this, &MainWindow::endTransmitMessage, &m_modulator, &Modulator::stop);
connect (this, &MainWindow::tune, &m_modulator, &Modulator::tune);
@@ -293,7 +292,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_auto=false;
m_waterfallAvg = 1;
m_txFirst=false;
Q_EMIT muteAudioOutput (false);
m_btxMute=false;
m_btxok=false;
m_restart=false;
@@ -414,7 +412,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
Q_EMIT initializeAudioOutputStream (m_config.audio_output_device (), AudioDevice::Mono == m_config.audio_output_channel () ? 1 : 2, m_msAudioOutputBuffered);
Q_EMIT transmitFrequency (m_txFreq - m_XIT);
Q_EMIT muteAudioOutput (false);
auto t = "UTC dB DT Freq Message";
ui->decodedTextLabel->setText(t);
@@ -670,6 +667,9 @@ void MainWindow::on_monitorButton_clicked (bool checked)
// make sure we have the current rig state
// Q_EMIT m_config.sync_transceiver (true);
qDebug () << "MainWindow::on_monitorButton_clicked: checked:" << checked;
qDebug () << "MainWindow::on_monitorButton_clicked: m_monitoring:" << m_monitoring << "m_transmitting:" << m_transmitting;
if (!m_transmitting)
{
m_monitoring = checked;
@@ -713,7 +713,6 @@ void MainWindow::on_autoButton_clicked (bool checked)
if (!m_auto)
{
m_btxok = false;
Q_EMIT muteAudioOutput ();
monitor (true);
m_repeatMsg = 0;
}
@@ -1460,7 +1459,6 @@ void MainWindow::guiUpdate()
}
if(!bTxTime || m_btxMute) {
m_btxok=false;
Q_EMIT muteAudioOutput ();
}
}
@@ -1578,7 +1576,6 @@ void MainWindow::guiUpdate()
}
m_btxok=true;
Q_EMIT muteAudioOutput (false);
m_transmitting=true;
ui->pbTxMode->setEnabled(false);
if(!m_tune) {
@@ -1677,7 +1674,6 @@ void MainWindow::startTx2()
monitor (false);
m_btxok=true;
Q_EMIT muteAudioOutput (false);
m_transmitting=true;
ui->pbTxMode->setEnabled(false);
}
@@ -2682,7 +2678,6 @@ void MainWindow::on_stopTxButton_clicked() //Stop Tx
}
m_btxok=false;
Q_EMIT muteAudioOutput ();
m_repeatMsg=0;
}
@@ -2809,7 +2804,6 @@ void MainWindow::handle_transceiver_failure (QString reason)
"border-width: 0px; border-radius: 5px;}");
m_btxok=false;
Q_EMIT muteAudioOutput ();
m_repeatMsg=0;
rigFailure ("Rig Control Error", reason);