summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-26 14:44:52 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-26 15:12:17 +0200
commitb820c648c80a097e009ac80fed1a29677b9bf25d (patch)
tree039917e1a36db73164c3ad059fadfed2e17148bb
parent5640d0d3c7df7e0eb03eb1921349066b0ee516b1 (diff)
downloadrockbox-b820c648c8.tar.gz
rockbox-b820c648c8.tar.bz2
rockbox-b820c648c8.zip
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
-rw-r--r--rbutil/rbutilqt/configure.cpp11
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro8
2 files changed, 1 insertions, 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 <QProgressDialog>
#include <QFileDialog>
#include <QUrl>
-#if !defined(Q_OS_LINUX)
#include <QSound>
-#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