mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix QMediaPlayer usage in Qt6

Browse Source
This commit is contained in:
Luis Ángel San Martín 2021-10-03 12:37:37 +02:00
parent 75060d4f24
commit e91481d0c3
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
YACReader/translator.cpp
View File

@ -287,26 +287,14 @@ void YACReaderTranslator::populateCombos()
void YACReaderTranslator::play() 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); player->setMedia(ttsSource);
#endif
player->play(); 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) void YACReaderTranslator::mousePressEvent(QMouseEvent *event)

10
YACReader/translator.h
View File

@ -15,19 +15,13 @@ class YACReaderBusyWidget;
#include <QUrl> #include <QUrl>
#include "viewer.h" #include "viewer.h"
#if QT_VERSION >= 0x050000
class QMediaPlayer; class QMediaPlayer;
#else
#include <Phonon/MediaObject>
using namespace Phonon;
#endif
class YACReaderTranslator : public QWidget class YACReaderTranslator : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
YACReaderTranslator(Viewer *parent = nullptr); YACReaderTranslator(Viewer *parent = nullptr);
~YACReaderTranslator() override;
public slots: public slots:
void play(); void play();
@ -50,11 +44,7 @@ protected:
QPoint click; QPoint click;
private: private:
#if QT_VERSION >= 0x050000
QMediaPlayer *player; QMediaPlayer *player;
#else
MediaObject *music;
#endif
QTextEdit *text; QTextEdit *text;
QComboBox *from; QComboBox *from;