Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the Text to speech api #55

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change the Text to speech api #55

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a847ad
Change the Text to speech api (previous api of http://mary.dfki.de is…
ravirnjn88 Mar 7, 2015
596084d
Checked the code with Qt4
ravirnjn88 Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/definitions/definitions.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
#define CERTIFICATE_PATH "certificate.pem"
#define KEY_PATH "key.pk8"
//#define TTS_SERVICE_URL "http://translate.google.com/translate_tts?tl=en&q=%1"
#define TTS_SERVICE_URL "http://mary.dfki.de:59125/process?INPUT_TEXT=%1&INPUT_TYPE=TEXT&OUTPUT_TYPE=AUDIO&AUDIO=WAVE_FILE&LOCALE=en_US"
//#define TTS_SERVICE_URL "http://mary.dfki.de:59125/process?INPUT_TEXT=%1&INPUT_TYPE=TEXT&OUTPUT_TYPE=AUDIO&AUDIO=WAVE_FILE&LOCALE=en_US"
#define TTS_SERVICE_URL "http://tts-api.com/tts.mp3?q=%1"

#define STORE_API_KEY "BuildmLearnToolkit"
#define STORE_ENDPOINT "http://croozeus.com/buildmlearn/api/v1/storeAPI.php"
Expand Down
10 changes: 8 additions & 2 deletions src/miscellaneous/iofactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#include <QDir>
#include <QFile>
#include <QTextStream>

#include <QMediaPlayer>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, solve those #includes correctly. QMediaPlayer class is only available in Qt5. You commented out QSound usages, therefore QSound #ïnclude is not needed anymore. You could for example replace line 43 with line 38.

#include <QUrl>

#if !defined(Q_OS_OS2)
#if QT_VERSION >= 0x050000
#include <QSound>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace this with line 38.

Expand All @@ -51,7 +53,11 @@ IOFactory::IOFactory() {

void IOFactory::playWaveFile(const QString &file_path) {
#if QT_VERSION >= 0x050000
QSound::play(file_path);
QMediaPlayer *player = new QMediaPlayer();
player->setMedia(QUrl::fromLocalFile(file_path));
player->setVolume(100);
player->play();
//QSound::play(file_path);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented line if your solution works.

#elif !defined(Q_OS_OS2)
Phonon::AudioOutput *out = new Phonon::AudioOutput(Phonon::MusicCategory, qApp);
out->setVolume(100.0f);
Expand Down
2 changes: 1 addition & 1 deletion src/templates/learnspellings/learnspellingssimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void LearnSpellingsSimulator::playWord() {

// Store downloaded sound file.
QString sound_file_name = qApp->templateManager()->tempDirectory() + QDir::separator() +
"sound_" + QDateTime::currentDateTime().toString("yyyy-MM-dd-hhmmss") + ".wav";
"sound_" + QDateTime::currentDateTime().toString("yyyy-MM-dd-hhmmss") + ".mp3";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you tested if mp3 files play also when you build the application with Qt4?

Toolkit must be compilable and runnable in both Qt4 and Qt5 because Qt4 is mandatory for OS/2 platform, which toolkit also supports.

QFile sound_file(sound_file_name);
sound_file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Unbuffered);
sound_file.write(output);
Expand Down