From e91481d0c3b88f2797b6ed8d7cf4544a32f42d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 3 Oct 2021 12:37:37 +0200 Subject: [PATCH] Fix QMediaPlayer usage in Qt6 --- YACReader/translator.cpp | 22 +++++----------------- YACReader/translator.h | 10 ---------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/YACReader/translator.cpp b/YACReader/translator.cpp index d3a81979..dcae81c0 100644 --- a/YACReader/translator.cpp +++ b/YACReader/translator.cpp @@ -287,26 +287,14 @@ void YACReaderTranslator::populateCombos() void YACReaderTranslator::play() { - // QMessageBox::question(this,"xxx",ttsSource.toString()); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + player->setSource(ttsSource); +#else player->setMedia(ttsSource); +#endif + player->play(); - -#else - MediaSource src(ttsSource); - src.setAutoDelete(true); - music->setCurrentSource(src); - music->play(); -#endif -} - -YACReaderTranslator::~YACReaderTranslator() -{ -#if QT_VERSION >= 0x050000 -#else - delete music; -#endif } void YACReaderTranslator::mousePressEvent(QMouseEvent *event) diff --git a/YACReader/translator.h b/YACReader/translator.h index 189c8fb8..be50f8b6 100644 --- a/YACReader/translator.h +++ b/YACReader/translator.h @@ -15,19 +15,13 @@ class YACReaderBusyWidget; #include #include "viewer.h" -#if QT_VERSION >= 0x050000 class QMediaPlayer; -#else -#include -using namespace Phonon; -#endif class YACReaderTranslator : public QWidget { Q_OBJECT public: YACReaderTranslator(Viewer *parent = nullptr); - ~YACReaderTranslator() override; public slots: void play(); @@ -50,11 +44,7 @@ protected: QPoint click; private: -#if QT_VERSION >= 0x050000 QMediaPlayer *player; -#else - MediaObject *music; -#endif QTextEdit *text; QComboBox *from;