projects
/
jspeed
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed default and white themes to show a speed camera warning image. Small fix...
[jspeed]
/
src
/
mediaplayer.cpp
diff --git
a/src/mediaplayer.cpp
b/src/mediaplayer.cpp
index
6651036
..
df6e99f
100644
(file)
--- a/
src/mediaplayer.cpp
+++ b/
src/mediaplayer.cpp
@@
-29,9
+29,14
@@
namespace
QString const LOCAL_SOUND_DIR = ":/resources/sounds/";
}
QString const LOCAL_SOUND_DIR = ":/resources/sounds/";
}
+void MediaPlayer::init()
+{
+ getPlayer();
+}
+
bool MediaPlayer::play(QString const& file)
{
bool MediaPlayer::play(QString const& file)
{
- static QMediaPlayer player;
+ QMediaPlayer* player = getPlayer();
QMediaContent media(QUrl::fromLocalFile(file));
QMediaContent media(QUrl::fromLocalFile(file));
@@
-40,11
+45,17
@@
bool MediaPlayer::play(QString const& file)
return false;
}
return false;
}
- player.setMedia(media);
- player.play();
+ player->setMedia(media);
+ player->play();
return true;
}
return true;
}
+QMediaPlayer* MediaPlayer::getPlayer()
+{
+ static QMediaPlayer player;
+ return &player;
+}
+
void MediaPlayer::getSupportedFormats(QList<QString>& formats)
{
formats.clear();
void MediaPlayer::getSupportedFormats(QList<QString>& formats)
{
formats.clear();