VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00
Code Issues Projects Releases Wiki Activity

Remote input/sink implemented remote control. Implements #1074

Browse Source
This commit is contained in:
f4exb
2021-12-26 11:56:37 +01:00
parent 1d2187d059
commit 58a9b2996d
10 changed files with 143 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/remoteinput/remoteinput.cpp
+17 -21
View File
@@ -60,7 +60,6 @@ RemoteInput::RemoteInput(DeviceAPI *deviceAPI) :
m_sampleFifo.setSize(m_sampleRate * 8);
m_remoteInputUDPHandler = new RemoteInputUDPHandler(&m_sampleFifo, m_deviceAPI);
m_remoteInputUDPHandler->setMessageQueueToInput(&m_inputMessageQueue);
connect(m_remoteInputUDPHandler, SIGNAL(metaChanged()), this, SLOT(handleMetaChanged()));
m_deviceAPI->setNbSourceStreams(1);
@@ -164,19 +163,31 @@ bool RemoteInput::isStreaming() const
bool RemoteInput::handleMessage(const Message& message)
{
if (RemoteInputUDPHandler::MsgReportSampleRateChange::match(message))
if (RemoteInputUDPHandler::MsgReportMetaDataChange::match(message))
{
RemoteInputUDPHandler::MsgReportSampleRateChange& notif = (RemoteInputUDPHandler::MsgReportSampleRateChange&) message;
int sampleRate = notif.getSampleRate();
qDebug() << "RemoteInput::handleMessage:" << message.getIdentifier();
RemoteInputUDPHandler::MsgReportMetaDataChange& notif = (RemoteInputUDPHandler::MsgReportMetaDataChange&) message;
m_currentMeta = notif.getMetaData();
int sampleRate = m_currentMeta.m_sampleRate;
if (sampleRate != m_sampleRate)
{
qDebug("RemoteInput::handleMessage: RemoteInputUDPHandler::MsgReportSampleRateChange: %d", sampleRate);
qDebug("RemoteInput::handleMessage: RemoteInputUDPHandler::MsgReportMetaDataChange: new sampleRate: %d", sampleRate);
QMutexLocker mutexLocker(&m_mutex);
m_sampleFifo.setSize(sampleRate * 8);
m_sampleRate = sampleRate;
}
m_currentMeta = m_remoteInputUDPHandler->getCurrentMeta();
QString getSettingsURL= QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings")
.arg(m_settings.m_apiAddress)
.arg(m_settings.m_apiPort)
.arg(m_currentMeta.m_deviceIndex)
.arg(m_currentMeta.m_channelIndex);
m_networkRequest.setUrl(QUrl(getSettingsURL));
m_networkManager->get(m_networkRequest);
return true;
}
else if (MsgStartStop::match(message))
@@ -218,6 +229,7 @@ bool RemoteInput::handleMessage(const Message& message)
}
else if (MsgRequestFixedData::match(message))
{
qDebug() << "RemoteInput::handleMessage:" << message.getIdentifier();
QString reportURL;
reportURL = QString("http://%1:%2/sdrangel")
@@ -701,20 +713,4 @@ void RemoteInput::analyzeRemoteChannelSettingsReply(const QJsonObject& jsonObjec
}
}
void RemoteInput::getRemoteChannelSettings()
{
QString getSettingsURL= QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings")
.arg(m_settings.m_apiAddress)
.arg(m_settings.m_apiPort)
.arg(m_currentMeta.m_deviceIndex)
.arg(m_currentMeta.m_channelIndex);
m_networkRequest.setUrl(QUrl(getSettingsURL));
m_networkManager->get(m_networkRequest);
}
void RemoteInput::handleMetaChanged()
{
m_currentMeta = m_remoteInputUDPHandler->getCurrentMeta();
getRemoteChannelSettings();
}