diff --git a/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in b/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in index c5556fd6b..4cd43c4e3 100644 --- a/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in +++ b/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in @@ -52,5 +52,7 @@ True NSCameraUsageDescription Streaming Video between devices + NSMicrophoneUsageDescription + Streaming Audio between devices diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 7f804f613..6025ad9ba 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -287,6 +287,9 @@ void SettingsModel::setPlaybackDevice (const QString &device) { Utils::appStringToCoreString(device) ); emit playbackDeviceChanged(device); + if (mSimpleCaptureGraph && mSimpleCaptureGraph->isRunning()) { + createCaptureGraph(); + } } // ----------------------------------------------------------------------------- diff --git a/linphone-app/src/components/sound-player/SoundPlayer.cpp b/linphone-app/src/components/sound-player/SoundPlayer.cpp index 2036d3f48..36b9f3d5d 100644 --- a/linphone-app/src/components/sound-player/SoundPlayer.cpp +++ b/linphone-app/src/components/sound-player/SoundPlayer.cpp @@ -63,6 +63,7 @@ SoundPlayer::SoundPlayer (QObject *parent) : QObject(parent) { mForceCloseTimer->setInterval(ForceCloseTimerInterval); QObject::connect(mForceCloseTimer, &QTimer::timeout, this, &SoundPlayer::handleEof); mHandlers = make_shared(this); +// Connection to rebuilding player when changing ringer selection. This player is only for Ringer. QObject::connect(settingsModel, &SettingsModel::ringerDeviceChanged, this, [this] { rebuildInternalPlayer(); }); diff --git a/linphone-app/ui/views/App/Settings/SettingsAudio.qml b/linphone-app/ui/views/App/Settings/SettingsAudio.qml index d160ad7cc..1112309c5 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAudio.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAudio.qml @@ -173,7 +173,7 @@ TabContainer { label: qsTr('ringerDeviceLabel') ComboBox { - enabled: !SettingsModel.isInCall + enabled: !SettingsModel.isInCall currentIndex: Utils.findIndex(model, function (device) { return device === SettingsModel.ringerDevice }) diff --git a/linphone-sdk b/linphone-sdk index 8fe350339..1e4a82374 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 8fe3503392d455b14fd8b2fbc28fb3817a061f95 +Subproject commit 1e4a8237474ed1bb20da91ce47b5ab34059ad471