Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-14 00:49:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats 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_ENABLE "Enable"
#define GROUP_SOUNDFILE "SoundFilePath" #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; SoundManager *soundManager = NULL;
SoundEvents::SoundEvents() SoundEvents::SoundEvents()
@ -243,23 +235,11 @@ void SoundManager::playFile(const QString &filename)
QString playFilename = realFilename(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 QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
if (!QAudioDeviceInfo::availableDevices(QAudio::AudioOutput).isEmpty()) if (!QAudioDeviceInfo::availableDevices(QAudio::AudioOutput).isEmpty())
#else #else
if (QSound::isAvailable()) if (QSound::isAvailable())
#endif #endif
QSound::play(playFilename); QSound::play(playFilename);
#endif
} }

7
retroshare-gui/src/gui/SoundManager.h
View File

@ -30,10 +30,6 @@
#define SOUND_MESSAGE_ARRIVED "MessageArrived" #define SOUND_MESSAGE_ARRIVED "MessageArrived"
#define SOUND_DOWNLOAD_COMPLETE "DownloadComplete" #define SOUND_DOWNLOAD_COMPLETE "DownloadComplete"
#ifdef UBUNTU
#include <phonon/mediaobject.h>
#endif
class SoundEvents class SoundEvents
{ {
public: public:
@ -91,9 +87,6 @@ public:
private: private:
SoundManager(); SoundManager();
#ifdef UBUNTU
static Phonon::MediaObject *mediaObject ;
#endif
}; };
extern SoundManager *soundManager; extern SoundManager *soundManager;

1
retroshare-gui/src/retroshare-gui.pro
View File

@ -66,7 +66,6 @@ linux-* {
PKGCONFIG *= x11 xscrnsaver PKGCONFIG *= x11 xscrnsaver
LIBS *= -lphonon
LIBS *= -rdynamic LIBS *= -rdynamic
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
DEFINES *= UBUNTU DEFINES *= UBUNTU