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

Make device title editable in the basic device settings. Fixes #2292

Browse Source
This commit is contained in:
f4exb
2026-01-28 02:48:42 +01:00
parent 5d6840b55a
commit 63348eeee1
354 changed files with 3956 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/audioinput/audioinput.cpp
+12
View File
@@ -403,6 +403,9 @@ void AudioInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getAudioInputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("device")) {
settings.m_deviceName = *response.getAudioInputSettings()->getDevice();
}
@@ -443,6 +446,12 @@ void AudioInput::webapiUpdateDeviceSettings(
void AudioInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const AudioInputSettings& settings)
{
if (response.getAudioInputSettings()->getTitle()) {
*response.getAudioInputSettings()->getTitle() = settings.m_title;
} else {
response.getAudioInputSettings()->setTitle(new QString(settings.m_title));
}
response.getAudioInputSettings()->setDevice(new QString(settings.m_deviceName));
response.getAudioInputSettings()->setDevSampleRate(settings.m_sampleRate);
response.getAudioInputSettings()->setVolume(settings.m_volume);
@@ -475,6 +484,9 @@ void AudioInput::webapiReverseSendSettings(const QList<QString>& deviceSettingsK
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (deviceSettingsKeys.contains("title") || force) {
swgAudioInputSettings->setTitle(new QString(settings.m_title));
}
if (deviceSettingsKeys.contains("device") || force) {
swgAudioInputSettings->setDevice(new QString(settings.m_deviceName));
}
plugins/samplesource/audioinput/audioinputgui.cpp
+21 -9
View File
@@ -24,6 +24,7 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "mainspectrum/mainspectrumgui.h"
#include "dsp/dspcommands.h"
#include "audioinputgui.h"
@@ -227,6 +228,8 @@ void AudioInputGui::refreshSampleRates(QString deviceName)
void AudioInputGui::displaySettings()
{
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
refreshDeviceList();
int index = ui->device->findText(m_settings.m_deviceName);
@@ -397,21 +400,30 @@ void AudioInputGui::openDeviceSettingsDialog(const QPoint& p)
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setTitle(m_settings.m_title);
dialog.setDefaultTitle(getDefaultTitle());
dialog.move(p);
new DialogPositioner(&dialog, false);
dialog.exec();
m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
if (dialog.result() == QDialog::Accepted)
{
m_settings.m_title = dialog.getTitle();
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settingsKeys.append("title");
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
sendSettings();
sendSettings();
}
}
resetContextMenuType();
plugins/samplesource/audioinput/audioinputsettings.cpp
+9
View File
@@ -29,6 +29,7 @@ AudioInputSettings::AudioInputSettings()
void AudioInputSettings::resetToDefaults()
{
m_title = "AudioInput";
m_deviceName = "";
m_sampleRate = 48000;
m_volume = 1.0f;
@@ -55,6 +56,7 @@ QByteArray AudioInputSettings::serialize() const
s.writeBool(6, m_dcBlock);
s.writeBool(7, m_iqImbalance);
s.writeS32(8, (int) m_fcPos);
s.writeString(9, m_title);
s.writeBool(24, m_useReverseAPI);
s.writeString(25, m_reverseAPIAddress);
@@ -88,6 +90,7 @@ bool AudioInputSettings::deserialize(const QByteArray& data)
d.readBool(7, &m_iqImbalance, false);
d.readS32(8, &intval, 2);
m_fcPos = (fcPos_t) intval;
d.readString(9, &m_title, "AudioInput");
d.readBool(24, &m_useReverseAPI, false);
d.readString(25, &m_reverseAPIAddress, "127.0.0.1");
@@ -113,6 +116,9 @@ bool AudioInputSettings::deserialize(const QByteArray& data)
void AudioInputSettings::applySettings(const QStringList& settingsKeys, const AudioInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("deviceName")) {
m_deviceName = settings.m_deviceName;
}
@@ -155,6 +161,9 @@ QString AudioInputSettings::getDebugString(const QStringList& settingsKeys, bool
{
std::ostringstream ostr;
if (settingsKeys.contains("title") || force) {
ostr << " m_title: " << m_title.toStdString();
}
if (settingsKeys.contains("deviceName") || force) {
ostr << " m_deviceName: " << m_deviceName.toStdString();
}
plugins/samplesource/audioinput/audioinputsettings.h
+1
View File
@@ -32,6 +32,7 @@ struct AudioInputSettings {
FC_POS_CENTER
} fcPos_t;
QString m_title;
QString m_deviceName; // Including realm, as from getFullDeviceName below
int m_sampleRate;
float m_volume;