Setlocal and update SDK.
Fix reset audio parameters when entering into call options.
This commit is contained in:
parent
90dff93a24
commit
a66528326f
4 changed files with 18 additions and 22 deletions
|
|
@ -49,6 +49,7 @@ int main(int argc, char *argv[]) {
|
||||||
QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
|
QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
|
||||||
// Disable QML cache. Avoid malformed cache.
|
// Disable QML cache. Avoid malformed cache.
|
||||||
qputenv("QML_DISABLE_DISK_CACHE", "true");
|
qputenv("QML_DISABLE_DISK_CACHE", "true");
|
||||||
|
setlocale(LC_CTYPE, ".UTF8");
|
||||||
|
|
||||||
auto app = QSharedPointer<App>::create(argc, argv);
|
auto app = QSharedPointer<App>::create(argc, argv);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ Thread::Thread(QObject *parent) : QThread(parent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Thread::run() {
|
void Thread::run() {
|
||||||
|
setlocale(LC_CTYPE, ".UTF8");
|
||||||
int toExit = false;
|
int toExit = false;
|
||||||
mThreadId = new QObject();
|
mThreadId = new QObject();
|
||||||
while (!toExit) {
|
while (!toExit) {
|
||||||
|
|
|
||||||
|
|
@ -43,16 +43,14 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ComboBox {
|
ComboSetting {
|
||||||
id: outputAudioDeviceCBox
|
id: outputAudioDeviceCBox
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredWidth: parent.width
|
Layout.preferredWidth: parent.width
|
||||||
Layout.preferredHeight: 49 * DefaultStyle.dp
|
Layout.preferredHeight: 49 * DefaultStyle.dp
|
||||||
model: SettingsCpp.playbackDevices
|
entries: SettingsCpp.playbackDevices
|
||||||
onCurrentTextChanged: {
|
propertyName: "playbackDevice"
|
||||||
if (mainItem.call) mainItem.call.core.lSetOutputAudioDevice(currentText)
|
propertyOwner: SettingsCpp
|
||||||
SettingsCpp.lSetPlaybackDevice(currentText)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Slider {
|
Slider {
|
||||||
id: speakerVolume
|
id: speakerVolume
|
||||||
|
|
@ -84,16 +82,14 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ComboBox {
|
ComboSetting {
|
||||||
id: inputAudioDeviceCBox
|
id: inputAudioDeviceCBox
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredWidth: parent.width
|
Layout.preferredWidth: parent.width
|
||||||
Layout.preferredHeight: 49 * DefaultStyle.dp
|
Layout.preferredHeight: 49 * DefaultStyle.dp
|
||||||
model: SettingsCpp.captureDevices
|
entries: SettingsCpp.captureDevices
|
||||||
onCurrentTextChanged: {
|
propertyName: "captureDevice"
|
||||||
if (mainItem.call) mainItem.call.core.lSetInputAudioDevice(currentText)
|
propertyOwner: SettingsCpp
|
||||||
SettingsCpp.lSetCaptureDevice(currentText)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Slider {
|
Slider {
|
||||||
id: microVolume
|
id: microVolume
|
||||||
|
|
@ -126,15 +122,15 @@ ColumnLayout {
|
||||||
width: audioTestSlider.availableWidth
|
width: audioTestSlider.availableWidth
|
||||||
height: implicitHeight
|
height: implicitHeight
|
||||||
radius: 2 * DefaultStyle.dp
|
radius: 2 * DefaultStyle.dp
|
||||||
color: "#D9D9D9"
|
color: DefaultStyle.grey_850
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: audioTestSlider.visualPosition * parent.width
|
width: audioTestSlider.visualPosition * parent.width
|
||||||
height: parent.height
|
height: parent.height
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
orientation: Gradient.Horizontal
|
orientation: Gradient.Horizontal
|
||||||
GradientStop { position: 0.0; color: "#6FF88D" }
|
GradientStop { position: 0.0; color: DefaultStyle.vue_meter_light_green }
|
||||||
GradientStop { position: 1.0; color: "#00D916" }
|
GradientStop { position: 1.0; color: DefaultStyle.vue_meter_dark_green}
|
||||||
}
|
}
|
||||||
radius: 2 * DefaultStyle.dp
|
radius: 2 * DefaultStyle.dp
|
||||||
}
|
}
|
||||||
|
|
@ -160,16 +156,14 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ComboBox {
|
ComboSetting {
|
||||||
id: videoDevicesCbox
|
id: videoDevicesCbox
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredWidth: parent.width
|
Layout.preferredWidth: parent.width
|
||||||
Layout.preferredHeight: 49 * DefaultStyle.dp
|
Layout.preferredHeight: 49 * DefaultStyle.dp
|
||||||
model: SettingsCpp.videoDevices
|
entries: SettingsCpp.videoDevices
|
||||||
currentIndex: SettingsCpp.videoDeviceIndex
|
propertyName: "videoDevice"
|
||||||
onCurrentTextChanged: {
|
propertyOwner: SettingsCpp
|
||||||
SettingsCpp.lSetVideoDevice(currentText)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
external/linphone-sdk
vendored
2
external/linphone-sdk
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 439a5b5faba6bda6b2b5a6a8ee1960a44b670059
|
Subproject commit 06adf9720c7deaeb4b271471349004a82ae0a104
|
||||||
Loading…
Reference in a new issue