Fixed YACReader compilation under Qt5 (YACReader-YACReaderLibrary communication is broken at runtime)

This commit is contained in:
Luis Ángel San Martín
2013-10-09 18:44:46 +02:00
parent d5a35de96c
commit b1d3bbb584
11 changed files with 83 additions and 35 deletions

View File

@ -1,6 +1,11 @@
#include <QUrl>
#if QT_VERSION >= 0x050000
#else
#include <Phonon/MediaObject>
#include <Phonon/MediaSource>
#endif
#include <QPushButton>
#include <QPalette>
#include <QMouseEvent>
@ -138,8 +143,6 @@ YACReaderTranslator::YACReaderTranslator(QWidget * parent)
resize(400,479);
music = createPlayer(MusicCategory);
layout->setMargin(0);
layout->setContentsMargins(18,12,18,12);
setContentsMargins(0,0,0,0);
@ -157,6 +160,13 @@ YACReaderTranslator::YACReaderTranslator(QWidget * parent)
connect(searchButton,SIGNAL(pressed()),this,SLOT(translate()));
connect(speakButton,SIGNAL(pressed()),this,SLOT(play()));
connect(clearButton,SIGNAL(pressed()),this,SLOT(clear()));
//multimedia/phonon
#if QT_VERSION >= 0x050000
#else
music = createPlayer(MusicCategory);
#endif
}
void YACReaderTranslator::hideResults()
@ -280,15 +290,21 @@ void YACReaderTranslator::populateCombos()
void YACReaderTranslator::play()
{
//QMessageBox::question(this,"xxx",ttsSource.toString());
#if QT_VERSION >= 0x050000
#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)