mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/camera_screen_sharing' into 'master'

Browse source 
Fix camera being toggled on when opening multimedia settings

See merge request BC/public/linphone-desktop!1799
This commit is contained in:
Gaëlle Braud 2026-04-07 09:10:14 +00:00
commit a9f3cf7521
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -177,7 +177,7 @@ add_option(OPTION_LIST ENABLE_UNIT_TESTS "Enable unit test of SDK." OFF)
add_option(OPTION_LIST ENABLE_UPDATE_CHECK "Enable update check." ON) add_option(OPTION_LIST ENABLE_UPDATE_CHECK "Enable update check." ON)
add_option(OPTION_LIST ENABLE_VIDEO "Enable Video support." YES) add_option(OPTION_LIST ENABLE_VIDEO "Enable Video support." YES)
add_option(OPTION_LIST ENABLE_WINDOWS_TOOLS_CHECK "Enable tools checks on Windows for auto install." OFF) add_option(OPTION_LIST ENABLE_WINDOWS_TOOLS_CHECK "Enable tools checks on Windows for auto install." OFF)
add_option(OPTION_LIST ENABLE_CRASH_HANDLER "Enable Crash Handler" YES) add_option(OPTION_LIST ENABLE_CRASH_HANDLER "Enable Crash Handler" NO)
add_cache(OPTION_LIST LINPHONE_SDK_MAKE_RELEASE_FILE_URL "Make a RELEASE file that work along check_version and use this URL" "") add_cache(OPTION_LIST LINPHONE_SDK_MAKE_RELEASE_FILE_URL "Make a RELEASE file that work along check_version and use this URL" "")

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

@ -214,10 +214,6 @@ void SettingsModel::accessCallSettings() {
emit captureDeviceChanged(getCaptureDevice()); emit captureDeviceChanged(getCaptureDevice());
emit playbackGainChanged(getPlaybackGain()); emit playbackGainChanged(getPlaybackGain());
emit captureGainChanged(getCaptureGain()); emit captureGainChanged(getCaptureGain());
// Video
CoreModel::getInstance()->getCore()->reloadVideoDevices();
emit videoDevicesChanged(getVideoDevices());
} }
void SettingsModel::updateCallSettings() { void SettingsModel::updateCallSettings() {
@ -232,9 +228,6 @@ void SettingsModel::updateCallSettings() {
emit captureDeviceChanged(getCaptureDevice()); emit captureDeviceChanged(getCaptureDevice());
emit playbackGainChanged(getPlaybackGain()); emit playbackGainChanged(getPlaybackGain());
emit captureGainChanged(getCaptureGain()); emit captureGainChanged(getCaptureGain());
// Video
emit videoDevicesChanged(getVideoDevices());
} }
void SettingsModel::closeCallSettings() { void SettingsModel::closeCallSettings() {