data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix playback/capture device in call parameters #LINQT-2302

Browse source
This commit is contained in:
gaelle 2026-01-07 16:47:37 +01:00
parent 3fb39cbb59
commit b1970ae200
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Linphone/model/setting/SettingsModel.cpp
View file

@ -58,7 +58,6 @@ SettingsModel::SettingsModel() {
if (gstate == linphone::GlobalState::On) { // reached when misc|config-uri is set in config and app starts if (gstate == linphone::GlobalState::On) { // reached when misc|config-uri is set in config and app starts
// and after config is fetched. // and after config is fetched.
notifyConfigReady(); notifyConfigReady();
} }
}); });
QObject::connect(CoreModel::getInstance().get(), &CoreModel::configuringStatus, this, QObject::connect(CoreModel::getInstance().get(), &CoreModel::configuringStatus, this,
@ -314,8 +313,6 @@ QVariantList SettingsModel::getCaptureDevices() const {
for (const auto &device : core->getExtendedAudioDevices()) { for (const auto &device : core->getExtendedAudioDevices()) {
if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityRecord)) { if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityRecord)) {
list << ToolModel::createVariant(device); list << ToolModel::createVariant(device);
} else if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityAll)) {
list << ToolModel::createVariant(device);
} }
} }
return list; return list;
@ -329,8 +326,6 @@ QVariantList SettingsModel::getPlaybackDevices() const {
for (const auto &device : core->getExtendedAudioDevices()) { for (const auto &device : core->getExtendedAudioDevices()) {
if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityPlay)) { if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityPlay)) {
list << ToolModel::createVariant(device); list << ToolModel::createVariant(device);
} else if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityAll)) {
list << ToolModel::createVariant(device);
} }
} }
@ -706,9 +701,6 @@ QString SettingsModel::getLogsEmail() const {
return Utils::coreStringToAppString(mConfig->getString(UiSection, "logs_email", Constants::DefaultLogsEmail)); return Utils::coreStringToAppString(mConfig->getString(UiSection, "logs_email", Constants::DefaultLogsEmail));
} }
// ============================================================================= // =============================================================================
// Do not disturb // Do not disturb
// ============================================================================= // =============================================================================

12
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -347,7 +347,17 @@ AbstractWindow {
Layout.preferredWidth: Utils.getSizeWithScreenRatio(30) Layout.preferredWidth: Utils.getSizeWithScreenRatio(30)
Layout.preferredHeight: Utils.getSizeWithScreenRatio(30) Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
// TODO : change with broadcast or meeting icon when available // TODO : change with broadcast or meeting icon when available
imageSource: !mainWindow.call ? AppIcons.meeting : (mainWindow.callState === LinphoneEnums.CallState.End || mainWindow.callState === LinphoneEnums.CallState.Released) ? AppIcons.endCall : (mainWindow.callState === LinphoneEnums.CallState.Paused || mainWindow.callState === LinphoneEnums.CallState.PausedByRemote) ? AppIcons.pause : mainWindow.conference ? AppIcons.usersThree : mainWindow.call.core.dir === LinphoneEnums.CallDir.Outgoing ? AppIcons.arrowUpRight : AppIcons.arrowDownLeft imageSource: !mainWindow.call
? AppIcons.meeting
: (mainWindow.callState === LinphoneEnums.CallState.End || mainWindow.callState === LinphoneEnums.CallState.Released)
? AppIcons.endCall
: (mainWindow.callState === LinphoneEnums.CallState.Paused || mainWindow.callState === LinphoneEnums.CallState.PausedByRemote)
? AppIcons.pause
: mainWindow.conference
? AppIcons.usersThree
: mainWindow.call.core.dir === LinphoneEnums.CallDir.Outgoing
? AppIcons.arrowUpRight
: AppIcons.arrowDownLeft
colorizationColor: !mainWindow.call colorizationColor: !mainWindow.call
|| mainWindow.call.core.paused || mainWindow.call.core.paused
|| mainWindow.callState || mainWindow.callState