diff options
Diffstat (limited to 'Swift/QtUI/QtSoundPlayer.cpp')
| -rw-r--r-- | Swift/QtUI/QtSoundPlayer.cpp | 28 | 
1 files changed, 3 insertions, 25 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(); -} -  }  | 
 Swift