diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
index 3201bbac7..5dd2acf38 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
@@ -211,20 +211,11 @@ void RemoteOutputSinkGui::updateSampleRate()
ui->deviceRateText->setText(tr("%1k").arg((float)(m_sampleRate) / 1000));
}
-void RemoteOutputSinkGui::updateTxDelayTooltip()
-{
- int samplesPerBlock = RemoteNbBytesPerBlock / (SDR_RX_SAMP_SZ <= 16 ? 4 : 8);
- double delay = ((127*samplesPerBlock*m_settings.m_txDelay) / m_settings.m_sampleRate)/(128 + m_settings.m_nbFECBlocks);
- ui->txDelayText->setToolTip(tr("%1 us").arg(QString::number(delay*1e6, 'f', 0)));
-}
-
void RemoteOutputSinkGui::displaySettings()
{
blockApplySettings(true);
ui->centerFrequency->setValue(m_deviceCenterFrequency / 1000);
ui->sampleRate->setValue(m_settings.m_sampleRate);
- ui->txDelay->setValue(m_settings.m_txDelay*100);
- ui->txDelayText->setText(tr("%1").arg(m_settings.m_txDelay*100));
ui->nbFECBlocks->setValue(m_settings.m_nbFECBlocks);
QString s0 = QString::number(128 + m_settings.m_nbFECBlocks, 'f', 0);
@@ -288,15 +279,6 @@ void RemoteOutputSinkGui::updateStatus()
void RemoteOutputSinkGui::on_sampleRate_changed(quint64 value)
{
m_settings.m_sampleRate = value;
- updateTxDelayTooltip();
- sendSettings();
-}
-
-void RemoteOutputSinkGui::on_txDelay_valueChanged(int value)
-{
- m_settings.m_txDelay = value / 100.0;
- ui->txDelayText->setText(tr("%1").arg(value));
- updateTxDelayTooltip();
sendSettings();
}
@@ -308,7 +290,6 @@ void RemoteOutputSinkGui::on_nbFECBlocks_valueChanged(int value)
QString s = QString::number(nbOriginalBlocks + nbFECBlocks, 'f', 0);
QString s1 = QString::number(nbFECBlocks, 'f', 0);
ui->nominalNbBlocksText->setText(tr("%1/%2").arg(s).arg(s1));
- updateTxDelayTooltip();
sendSettings();
}
diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.h b/plugins/samplesink/remoteoutput/remoteoutputgui.h
index e8d6a582f..6cf7e644a 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputgui.h
+++ b/plugins/samplesink/remoteoutput/remoteoutputgui.h
@@ -124,7 +124,6 @@ private:
void sendControl(bool force = false);
void sendSettings();
void updateSampleRate();
- void updateTxDelayTooltip();
void displayEventCounts();
void displayEventStatus(int recoverableCount, int unrecoverableCount);
void displayEventTimer();
@@ -134,7 +133,6 @@ private:
private slots:
void handleInputMessages();
void on_sampleRate_changed(quint64 value);
- void on_txDelay_valueChanged(int value);
void on_nbFECBlocks_valueChanged(int value);
void on_deviceIndex_returnPressed();
void on_channelIndex_returnPressed();
diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.ui b/plugins/samplesink/remoteoutput/remoteoutputgui.ui
index 044929aa5..05b451bd2 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputgui.ui
+++ b/plugins/samplesink/remoteoutput/remoteoutputgui.ui
@@ -249,60 +249,6 @@
- -
-
-
- UDly
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- Delay between consecutive UDP packets in percentage of nominal UDP packet process time
-
-
- 10
-
-
- 90
-
-
- 1
-
-
- 50
-
-
-
- -
-
-
-
- 20
- 0
-
-
-
-
- 20
- 16777215
-
-
-
- 90
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
diff --git a/plugins/samplesink/remoteoutput/remoteoutputsender.cpp b/plugins/samplesink/remoteoutput/remoteoutputsender.cpp
index 87380fdf8..c68834775 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputsender.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputsender.cpp
@@ -22,8 +22,6 @@
///////////////////////////////////////////////////////////////////////////////////
-#include
-#include
#include
#include
@@ -93,7 +91,6 @@ void RemoteOutputSender::sendDataBlock(RemoteDataBlock *dataBlock)
uint16_t frameIndex = dataBlock->m_txControlBlock.m_frameIndex;
int nbBlocksFEC = dataBlock->m_txControlBlock.m_nbBlocksFEC;
- int txDelay = dataBlock->m_txControlBlock.m_txDelay;
m_remoteHostAddress.setAddress(dataBlock->m_txControlBlock.m_dataAddress);
uint16_t dataPort = dataBlock->m_txControlBlock.m_dataPort;
RemoteSuperBlock *txBlockx = dataBlock->m_superBlocks;
@@ -102,11 +99,8 @@ void RemoteOutputSender::sendDataBlock(RemoteDataBlock *dataBlock)
{
if (m_udpSocket)
{
- for (int i = 0; i < RemoteNbOrginalBlocks; i++)
- {
- // send block via UDP
+ for (int i = 0; i < RemoteNbOrginalBlocks; i++) { // send block via UDP
m_udpSocket->writeDatagram((const char*)&txBlockx[i], (qint64 ) RemoteUdpSize, m_remoteHostAddress, dataPort);
- std::this_thread::sleep_for(std::chrono::microseconds(txDelay));
}
}
}
@@ -152,11 +146,8 @@ void RemoteOutputSender::sendDataBlock(RemoteDataBlock *dataBlock)
// Transmit all blocks
if (m_udpSocket)
{
- for (int i = 0; i < cm256Params.OriginalCount + cm256Params.RecoveryCount; i++)
- {
- // send block via UDP
+ for (int i = 0; i < cm256Params.OriginalCount + cm256Params.RecoveryCount; i++) { // send block via UDP
m_udpSocket->writeDatagram((const char*)&txBlockx[i], (qint64 ) RemoteUdpSize, m_remoteHostAddress, dataPort);
- std::this_thread::sleep_for(std::chrono::microseconds(txDelay));
}
}
}