From b820c648c80a097e009ac80fed1a29677b9bf25d Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 26 Jul 2020 14:44:52 +0200 Subject: [PATCH] rbutil: Always use Qt Multimedia to play TTS preview. We're using it on Windows and macOS, there's no reason to not do so on Linux. Change-Id: I6e4d9006eff22fd4bf6b882407a5497b2f8cdd2f --- rbutil/rbutilqt/configure.cpp | 11 ----------- rbutil/rbutilqt/rbutilqt.pro | 8 +------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 246b9a0fda..bcb52304e4 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -20,9 +20,7 @@ #include #include #include -#if !defined(Q_OS_LINUX) #include -#endif #include "version.h" #include "configure.h" @@ -951,16 +949,7 @@ void Config::testTts() } tts->stop(); if(!filename.isEmpty()) { -#if defined(Q_OS_LINUX) - QString exe = Utils::findExecutable("aplay"); - if(exe == "") exe = Utils::findExecutable("play"); - if(exe != "") - { - QProcess::execute(exe+" "+filename); - } -#else QSound::play(filename); -#endif } ui.testTTS->setEnabled(true); delete tts; /* Config objects are never deleted (in fact, they are diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index f2d17e23ab..b48e52cefa 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -157,13 +157,7 @@ QT += network contains(QT_MAJOR_VERSION, 5) { message("Qt5 found") - QT += widgets - win32 { - QT += multimedia - } - macx { - QT += multimedia - } + QT += widgets multimedia } CONFIG += c++11