projects
/
jspeed
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small optimization to media player. Web page updated.
[jspeed]
/
src
/
mediaplayer.cpp
diff --git
a/src/mediaplayer.cpp
b/src/mediaplayer.cpp
index
a9c6b6d
..
6651036
100644
(file)
--- a/
src/mediaplayer.cpp
+++ b/
src/mediaplayer.cpp
@@
-18,6
+18,7
@@
#include <QtCore/QUrl>
#include <QtCore/QDir>
#include <QtCore/QUrl>
#include <QtCore/QDir>
+#include <QMediaPlayer>
#include <QMediaContent>
#include "mediaplayer.h"
#include "settings.h"
#include <QMediaContent>
#include "mediaplayer.h"
#include "settings.h"
@@
-28,10
+29,10
@@
namespace
QString const LOCAL_SOUND_DIR = ":/resources/sounds/";
}
QString const LOCAL_SOUND_DIR = ":/resources/sounds/";
}
-QMediaPlayer MediaPlayer::player_;
-
bool MediaPlayer::play(QString const& file)
{
bool MediaPlayer::play(QString const& file)
{
+ static QMediaPlayer player;
+
QMediaContent media(QUrl::fromLocalFile(file));
if(media.isNull())
QMediaContent media(QUrl::fromLocalFile(file));
if(media.isNull())
@@
-39,8
+40,8
@@
bool MediaPlayer::play(QString const& file)
return false;
}
return false;
}
- player_.setMedia(media);
- player_.play();
+ player.setMedia(media);
+ player.play();
return true;
}
return true;
}