From a66528326f80053551813f937110ed8316cb76ab Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 27 Sep 2024 17:06:00 +0200
Subject: [PATCH] Setlocal and update SDK. Fix reset audio parameters when
 entering into call options.

---
 Linphone/main.cpp                             |  1 +
 Linphone/tool/thread/Thread.cpp               |  1 +
 .../Form/Settings/MultimediaSettings.qml      | 36 ++++++++-----------
 external/linphone-sdk                         |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Linphone/main.cpp b/Linphone/main.cpp
index 2622b256..202b69d1 100644
--- a/Linphone/main.cpp
+++ b/Linphone/main.cpp
@@ -49,6 +49,7 @@ int main(int argc, char *argv[]) {
 	QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 	// Disable QML cache. Avoid malformed cache.
 	qputenv("QML_DISABLE_DISK_CACHE", "true");
+	setlocale(LC_CTYPE, ".UTF8");
 
 	auto app = QSharedPointer<App>::create(argc, argv);
 
diff --git a/Linphone/tool/thread/Thread.cpp b/Linphone/tool/thread/Thread.cpp
index 9b154595..631708a2 100644
--- a/Linphone/tool/thread/Thread.cpp
+++ b/Linphone/tool/thread/Thread.cpp
@@ -27,6 +27,7 @@ Thread::Thread(QObject *parent) : QThread(parent) {
 }
 
 void Thread::run() {
+	setlocale(LC_CTYPE, ".UTF8");
 	int toExit = false;
 	mThreadId = new QObject();
 	while (!toExit) {
diff --git a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
index c058d3af..947e4b7e 100644
--- a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
+++ b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
@@ -43,16 +43,14 @@ ColumnLayout {
 						Layout.fillWidth: true
 					}
 				}
-				ComboBox {
+				ComboSetting {
 					id: outputAudioDeviceCBox
 					Layout.fillWidth: true
 					Layout.preferredWidth: parent.width
 					Layout.preferredHeight: 49 * DefaultStyle.dp
-					model: SettingsCpp.playbackDevices
-					onCurrentTextChanged: {
-						if (mainItem.call) mainItem.call.core.lSetOutputAudioDevice(currentText)
-						SettingsCpp.lSetPlaybackDevice(currentText)
-					}
+					entries: SettingsCpp.playbackDevices
+					propertyName: "playbackDevice"
+					propertyOwner: SettingsCpp
 				}
 				Slider {
 					id: speakerVolume
@@ -84,16 +82,14 @@ ColumnLayout {
 						Layout.fillWidth: true
 					}
 				}
-				ComboBox {
+				ComboSetting {
 					id: inputAudioDeviceCBox
 					Layout.fillWidth: true
 					Layout.preferredWidth: parent.width
 					Layout.preferredHeight: 49 * DefaultStyle.dp
-					model: SettingsCpp.captureDevices
-					onCurrentTextChanged: {
-						if (mainItem.call) mainItem.call.core.lSetInputAudioDevice(currentText)
-						SettingsCpp.lSetCaptureDevice(currentText)
-					}
+					entries: SettingsCpp.captureDevices
+					propertyName: "captureDevice"
+					propertyOwner: SettingsCpp
 				}
 				Slider {
 					id: microVolume
@@ -126,15 +122,15 @@ ColumnLayout {
 						width: audioTestSlider.availableWidth
 						height: implicitHeight
 						radius: 2 * DefaultStyle.dp
-						color: "#D9D9D9"
+						color: DefaultStyle.grey_850
 
 						Rectangle {
 							width: audioTestSlider.visualPosition * parent.width
 							height: parent.height
 							gradient: Gradient {
 								orientation: Gradient.Horizontal
-								GradientStop { position: 0.0; color: "#6FF88D" }
-								GradientStop { position: 1.0; color: "#00D916" }
+								GradientStop { position: 0.0; color: DefaultStyle.vue_meter_light_green }
+								GradientStop { position: 1.0; color: DefaultStyle.vue_meter_dark_green}
 							}
 							radius: 2 * DefaultStyle.dp
 						}
@@ -160,16 +156,14 @@ ColumnLayout {
 						Layout.fillWidth: true
 					}
 				}
-				ComboBox {
+				ComboSetting {
 					id: videoDevicesCbox
 					Layout.fillWidth: true
 					Layout.preferredWidth: parent.width
 					Layout.preferredHeight: 49 * DefaultStyle.dp
-					model: SettingsCpp.videoDevices
-					currentIndex: SettingsCpp.videoDeviceIndex
-					onCurrentTextChanged: {
-						SettingsCpp.lSetVideoDevice(currentText)
-					}
+					entries: SettingsCpp.videoDevices
+					propertyName: "videoDevice"
+					propertyOwner: SettingsCpp
 				}
 			}
 		}
diff --git a/external/linphone-sdk b/external/linphone-sdk
index 439a5b5f..06adf972 160000
--- a/external/linphone-sdk
+++ b/external/linphone-sdk
@@ -1 +1 @@
-Subproject commit 439a5b5faba6bda6b2b5a6a8ee1960a44b670059
+Subproject commit 06adf9720c7deaeb4b271471349004a82ae0a104