mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 15:35:51 +00:00
Code Issues Releases Wiki Activity

Implement media device tracking on macOS.

Browse Source
This commit is contained in:
John Preston
2024-01-23 13:23:32 +04:00
parent 736b489eb7
commit 65a80766f4
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/media/audio/media_audio.cpp
View File

@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/audio/media_audio_track.h" #include "media/audio/media_audio_track.h"
#include "media/media_common.h" #include "media/media_common.h"
#include "media/streaming/media_streaming_utility.h" #include "media/streaming/media_streaming_utility.h"
#include "webrtc/webrtc_environment.h"
#include "webrtc/webrtc_media_devices.h" #include "webrtc/webrtc_media_devices.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
@@ -144,8 +145,11 @@ bool CreatePlaybackDevice() {
const auto id = Current().deviceId().toStdString(); const auto id = Current().deviceId().toStdString();
AudioDevice = alcOpenDevice(id.c_str()); AudioDevice = alcOpenDevice(id.c_str());
if (!AudioDevice) { if (!AudioDevice) {
LOG(("Audio Error: Could not create default playback device, enumerating..")); LOG(("Audio Error: Could not create default playback device, refreshing.."));
EnumeratePlaybackDevices(); crl::on_main([] {
const auto type = Webrtc::DeviceType::Playback;
Core::App().mediaDevices().forceRefresh(type);
});
return false; return false;
} }

3
Telegram/SourceFiles/settings/settings_calls.cpp
View File

@@ -555,7 +555,8 @@ void ChooseAudioDeviceBox(
return; return;
} }
const auto weak = Ui::MakeWeak(box); const auto weak = Ui::MakeWeak(box);
chosen(state->ids.take(value).value_or(kDefaultDeviceId)); const auto i = state->ids.find(value);
chosen((i != end(state->ids)) ? i->second : kDefaultDeviceId);
if (weak) { if (weak) {
box->closeBox(); box->closeBox();
} }

2
Telegram/lib_webrtc

Submodule Telegram/lib_webrtc updated: 5a83169788...b78e51ad98