From ced2652debd8b896c3ed1da1b895293bf0e54c97 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 14 May 2020 08:39:45 +0400 Subject: [PATCH] OpenAL returns device names with UTF-8 --- Telegram/SourceFiles/media/audio/media_audio.cpp | 8 ++++---- Telegram/SourceFiles/media/audio/media_audio_capture.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp index 9356bfc78..74564a27b 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -86,14 +86,14 @@ void EnumeratePlaybackDevices() { Assert(devices != nullptr); while (*devices != 0) { auto deviceName8Bit = QByteArray(devices); - auto deviceName = QString::fromLocal8Bit(deviceName8Bit); + auto deviceName = QString::fromUtf8(deviceName8Bit); deviceNames.append(deviceName); devices += deviceName8Bit.size() + 1; } LOG(("Audio Playback Devices: %1").arg(deviceNames.join(';'))); if (auto device = alcGetString(nullptr, ALC_DEFAULT_ALL_DEVICES_SPECIFIER)) { - LOG(("Audio Playback Default Device: %1").arg(QString::fromLocal8Bit(device))); + LOG(("Audio Playback Default Device: %1").arg(QString::fromUtf8(device))); } else { LOG(("Audio Playback Default Device: (null)")); } @@ -105,14 +105,14 @@ void EnumerateCaptureDevices() { Assert(devices != nullptr); while (*devices != 0) { auto deviceName8Bit = QByteArray(devices); - auto deviceName = QString::fromLocal8Bit(deviceName8Bit); + auto deviceName = QString::fromUtf8(deviceName8Bit); deviceNames.append(deviceName); devices += deviceName8Bit.size() + 1; } LOG(("Audio Capture Devices: %1").arg(deviceNames.join(';'))); if (auto device = alcGetString(nullptr, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)) { - LOG(("Audio Capture Default Device: %1").arg(QString::fromLocal8Bit(device))); + LOG(("Audio Capture Default Device: %1").arg(QString::fromUtf8(device))); } else { LOG(("Audio Capture Default Device: (null)")); } diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp index 3bc9a3845..53ded4255 100644 --- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp @@ -63,7 +63,7 @@ Instance::Instance() : _inner(new Inner(&_thread)) { void Instance::check() { _available = false; if (auto device = alcGetString(0, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)) { - if (!QString::fromLocal8Bit(device).isEmpty()) { + if (!QString::fromUtf8(device).isEmpty()) { _available = true; return; }