VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 05:37:50 -04:00
Code Issues Projects Releases Wiki Activity

Fix gcc warnings.

Browse Source
This commit is contained in:
srcejon 2024-02-27 14:24:27 +00:00
parent 8ad555972e
commit 6d0500ccbf
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/remotetcpinput/remotetcpinput.cpp
View File

@ -394,6 +394,9 @@ void RemoteTCPInput::webapiUpdateDeviceSettings(
if (deviceSettingsKeys.contains("preFill")) { if (deviceSettingsKeys.contains("preFill")) {
settings.m_preFill = response.getRemoteTcpInputSettings()->getPreFill() != 0; settings.m_preFill = response.getRemoteTcpInputSettings()->getPreFill() != 0;
} }
if (deviceSettingsKeys.contains("protocol")) {
settings.m_protocol = *response.getRemoteTcpInputSettings()->getProtocol();
}
if (deviceSettingsKeys.contains("useReverseAPI")) { if (deviceSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getRemoteTcpInputSettings()->getUseReverseApi() != 0; settings.m_useReverseAPI = response.getRemoteTcpInputSettings()->getUseReverseApi() != 0;
} }
@ -430,6 +433,7 @@ void RemoteTCPInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings&
response.getRemoteTcpInputSettings()->setDataPort(settings.m_dataPort); response.getRemoteTcpInputSettings()->setDataPort(settings.m_dataPort);
response.getRemoteTcpInputSettings()->setOverrideRemoteSettings(settings.m_overrideRemoteSettings ? 1 : 0); response.getRemoteTcpInputSettings()->setOverrideRemoteSettings(settings.m_overrideRemoteSettings ? 1 : 0);
response.getRemoteTcpInputSettings()->setPreFill(settings.m_preFill ? 1 : 0); response.getRemoteTcpInputSettings()->setPreFill(settings.m_preFill ? 1 : 0);
response.getRemoteTcpInputSettings()->setProtocol(new QString(settings.m_protocol));
response.getRemoteTcpInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); response.getRemoteTcpInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);

2
plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp
View File

@ -847,6 +847,8 @@ void RemoteTCPInputGui::on_preFill_valueChanged(int value)
void RemoteTCPInputGui::on_protocol_currentIndexChanged(int index) void RemoteTCPInputGui::on_protocol_currentIndexChanged(int index)
{ {
(void) index;
m_settings.m_protocol = ui->protocol->currentText(); m_settings.m_protocol = ui->protocol->currentText();
m_settingsKeys.append("protocol"); m_settingsKeys.append("protocol");
sendSettings(); sendSettings();

8
plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
View File

@ -407,7 +407,7 @@ void RemoteTCPInputTCPHandler::spyServerConnect()
SpyServerProtocol::encodeUInt32(&request[0], 0); SpyServerProtocol::encodeUInt32(&request[0], 0);
SpyServerProtocol::encodeUInt32(&request[4], 4+9); SpyServerProtocol::encodeUInt32(&request[4], 4+9);
SpyServerProtocol::encodeUInt32(&request[8], SpyServerProtocol::ProtocolID); SpyServerProtocol::encodeUInt32(&request[8], SpyServerProtocol::ProtocolID);
memcpy(&request[8+5], "SDRangel", 9); memcpy(&request[8+4], "SDRangel", 9);
if (m_dataSocket) { if (m_dataSocket) {
m_dataSocket->write((char*)request, sizeof(request)); m_dataSocket->write((char*)request, sizeof(request));
} }
@ -876,7 +876,7 @@ void RemoteTCPInputTCPHandler::processSpyServerDevice(const SpyServerProtocol::D
m_settings.m_devSampleRate = settings.m_devSampleRate = ssDevice->m_sampleRate; m_settings.m_devSampleRate = settings.m_devSampleRate = ssDevice->m_sampleRate;
settingsKeys.append("devSampleRate"); settingsKeys.append("devSampleRate");
// Make sure decimation setting is at least the minimum // Make sure decimation setting is at least the minimum
if (!m_settings.m_overrideRemoteSettings || (settings.m_log2Decim < ssDevice->m_minDecimation)) if (!m_settings.m_overrideRemoteSettings || (settings.m_log2Decim < (int) ssDevice->m_minDecimation))
{ {
m_settings.m_log2Decim = settings.m_log2Decim = ssDevice->m_minDecimation; m_settings.m_log2Decim = settings.m_log2Decim = ssDevice->m_minDecimation;
settingsKeys.append("log2Decim"); settingsKeys.append("log2Decim");
@ -914,7 +914,7 @@ void RemoteTCPInputTCPHandler::processSpyServerState(const SpyServerProtocol::St
settings.m_centerFrequency = ssState->m_iqCenterFrequency; settings.m_centerFrequency = ssState->m_iqCenterFrequency;
settingsKeys.append("centerFrequency"); settingsKeys.append("centerFrequency");
} }
if (m_settings.m_gain[0] != ssState->m_gain) if (m_settings.m_gain[0] != (qint32) ssState->m_gain)
{ {
settings.m_gain[0] = ssState->m_gain; settings.m_gain[0] = ssState->m_gain;
settingsKeys.append("gain[0]"); settingsKeys.append("gain[0]");
@ -943,7 +943,7 @@ void RemoteTCPInputTCPHandler::processSpyServerData(int requiredBytes, bool clea
{ {
if (m_state == HEADER) if (m_state == HEADER)
{ {
if (m_dataSocket->bytesAvailable() >= sizeof(SpyServerProtocol::Header)) if (m_dataSocket->bytesAvailable() >= (qint64) sizeof(SpyServerProtocol::Header))
{ {
qint64 bytesRead = m_dataSocket->read((char *) &m_spyServerHeader, sizeof(SpyServerProtocol::Header)); qint64 bytesRead = m_dataSocket->read((char *) &m_spyServerHeader, sizeof(SpyServerProtocol::Header));
if (bytesRead == sizeof(SpyServerProtocol::Header)) { if (bytesRead == sizeof(SpyServerProtocol::Header)) {