Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 20:04:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

reverted commit for phonon since phonon is deprecated. Will be replaced by qtmultimedia in the next commit

Browse source
This commit is contained in:
Cyril Soler 2016-01-21 11:32:17 -05:00
parent 7488ba19ff
commit 9999742ec7
3 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
retroshare-gui/src/gui/SoundManager.cpp
View file

@ -37,14 +37,6 @@
#define GROUP_ENABLE "Enable"
#define GROUP_SOUNDFILE "SoundFilePath"
#ifdef UBUNTU
#include <phonon/audiooutput.h>
#include <phonon/mediaobject.h>
#include <phonon/mediasource.h>
Phonon::MediaObject *SoundManager::mediaObject = NULL ;
#endif
SoundManager *soundManager = NULL;
SoundEvents::SoundEvents()
@ -243,23 +235,11 @@ void SoundManager::playFile(const QString &filename)
QString playFilename = realFilename(filename);
#ifdef UBUNTU
// The media object is only deleted before being used, so as to avoid a memory leak. We cannot delete it after calling play() because the
// playing is asynchronous. The way to do this properly would be to connect the finish() signal of the player to some slot that delete it,
// assuming it's not done in a static method like now.
if(mediaObject != NULL)
delete mediaObject ;
mediaObject = Phonon::createPlayer(Phonon::NotificationCategory, Phonon::MediaSource(QUrl::fromLocalFile(filename)));
mediaObject->play();
#else
#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
if (!QAudioDeviceInfo::availableDevices(QAudio::AudioOutput).isEmpty())
#else
if (QSound::isAvailable())
#endif
QSound::play(playFilename);
#endif
}