From 086e35d106ee9e6030c68d63b36a4626502cf604 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Mon, 11 Jan 2016 00:47:59 +0100 Subject: [PATCH] use utf-8 strings for audio device specifiers --- src/widget/form/settings/avform.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp index 2edeb2680..9ebbe880d 100644 --- a/src/widget/form/settings/avform.cpp +++ b/src/widget/form/settings/avform.cpp @@ -286,11 +286,7 @@ void AVForm::getAudioInDevices() while (*pDeviceList) { int len = strlen(pDeviceList); -#ifdef Q_OS_WIN QString inDev = QString::fromUtf8(pDeviceList, len); -#else - QString inDev = QString::fromLocal8Bit(pDeviceList, len); -#endif bodyUI->inDevCombobox->addItem(inDev); if (settingsInDev == inDev) inDevIndex = bodyUI->inDevCombobox->count()-1; @@ -317,11 +313,7 @@ void AVForm::getAudioOutDevices() while (*pDeviceList) { int len = strlen(pDeviceList); -#ifdef Q_OS_WIN QString outDev = QString::fromUtf8(pDeviceList, len); -#else - QString outDev = QString::fromLocal8Bit(pDeviceList, len); -#endif bodyUI->outDevCombobox->addItem(outDev); if (settingsOutDev == outDev) {