Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-20 18:27:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-20 18:27:23 (GMT) |
| commit | 8149107ade43f9c9fff8fe134f1bce5b5e8b2234 (patch) | |
| tree | f395f60c01cd3564fcc61ba1fa7ab65e5e2a6821 /Swift | |
| parent | 059ace39c432a89845e245604af03f5f71e1da84 (diff) | |
| download | swift-8149107ade43f9c9fff8fe134f1bce5b5e8b2234.zip swift-8149107ade43f9c9fff8fe134f1bce5b5e8b2234.tar.bz2 | |
Use QSound for sounds.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtSoundPlayer.cpp | 28 | ||||
| -rw-r--r-- | Swift/QtUI/QtSoundPlayer.h | 14 |
2 files changed, 5 insertions, 37 deletions
diff --git a/Swift/QtUI/QtSoundPlayer.cpp b/Swift/QtUI/QtSoundPlayer.cpp index 4aa6b8e..246509e 100644 --- a/Swift/QtUI/QtSoundPlayer.cpp +++ b/Swift/QtUI/QtSoundPlayer.cpp @@ -1,40 +1,18 @@ #include "QtSoundPlayer.h" -#ifdef Q_WS_X11 -#include "mediaobject.h" -#include "audiooutput.h" -#else -#include <phonon/MediaObject> -#include <phonon/AudioOutput> -#endif +#include <QSound> -namespace Swift{ +namespace Swift { QtSoundPlayer::QtSoundPlayer() { - audioOutput_ = new Phonon::AudioOutput(Phonon::NotificationCategory); - - messageReceived_ = new Phonon::MediaObject(); - messageReceived_->setCurrentSource(Phonon::MediaSource(":/sounds/message-received.wav")); - Phonon::createPath(messageReceived_, audioOutput_); - connect(messageReceived_, SIGNAL(finished()), this, SLOT(handleFinished())); } -QtSoundPlayer::~QtSoundPlayer() { - delete messageReceived_; - delete audioOutput_; -} - void QtSoundPlayer::playSound(SoundEffect sound) { switch (sound) { case MessageReceived: - //messageReceived_->stop(); - messageReceived_->play(); + QSound::play(":/sounds/message-received.wav"); break; } } -void QtSoundPlayer::handleFinished() { - messageReceived_->stop(); -} - } diff --git a/Swift/QtUI/QtSoundPlayer.h b/Swift/QtUI/QtSoundPlayer.h index b9109a7..a75f042 100644 --- a/Swift/QtUI/QtSoundPlayer.h +++ b/Swift/QtUI/QtSoundPlayer.h @@ -4,22 +4,12 @@ #include <QObject> -namespace Phonon { - class AudioOutput; - class MediaObject; -} - namespace Swift { class QtSoundPlayer : public QObject, public SoundPlayer { - Q_OBJECT + Q_OBJECT public: QtSoundPlayer(); - ~QtSoundPlayer(); + void playSound(SoundEffect sound); - private: - Phonon::AudioOutput* audioOutput_; - Phonon::MediaObject* messageReceived_; - private slots: - void handleFinished(); }; } |