diff options
| author |  Voker57 | 2008-04-18 03:38:51 +0000 |
|---|---|---|
| committer | Voker57 | 2008-04-18 03:38:51 +0000 |
| commit | d344622fb760386b79e9224965c4e39cb29e78d2 (patch) | |
| tree | 8b0e9be874bb28a3d6c75bf08549190ef1806e9c | |
| parent | fixed DBus compilation for win32 (diff) | |
| download | KVIrc-d344622fb760386b79e9224965c4e39cb29e78d2.tar.gz KVIrc-d344622fb760386b79e9224965c4e39cb29e78d2.tar.bz2 KVIrc-d344622fb760386b79e9224965c4e39cb29e78d2.zip | |
more Phonon&kde4
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1498 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/snd/libkvisnd.cpp | 10 | ||||
| -rw-r--r-- | src/modules/snd/libkvisnd.h | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c33eeb7f8..2457271de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,7 @@ IF(QT4_FOUND) # Phonon support IF(QT_PHONON_FOUND) ADD_DEFINITIONS(-DCOMPILE_PHONON_SUPPORT) - SET(CMAKE_STATUS_PHONON_SUPPORT "yes") + SET(CMAKE_STATUS_PHONON_SUPPORT "qt") LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS -DCOMPILE_PHONON_SUPPORT=1) SET(QT_USE_PHONON true) ELSE() @@ -195,10 +195,12 @@ IF(WITH_KDE4) FIND_PACKAGE(KDE4) IF(KDE4_FOUND) INCLUDE_DIRECTORIES(${KDE4_INCLUDES}) + ADD_DEFINITIONS(${KDE4_DEFINITIONS}) ADD_DEFINITIONS(-DCOMPILE_KDE_SUPPORT) LIST(APPEND LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS}) SET(CMAKE_STATUS_KDE4_SUPPORT "yes") LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS -DCOMPILE_KDE_SUPPORT=1) + SET(CMAKE_STATUS_PHONON_SUPPORT "kde") ELSE() SET(CMAKE_STATUS_KDE4_SUPPORT "not available") ENDIF() diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 42f8378a9..506aac9d1 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -37,7 +37,13 @@ #include <QSound> #ifdef COMPILE_PHONON_SUPPORT -#include <Phonon> + #ifdef COMPILE_KDE_SUPPORT + #include <Phonon/MediaObject> + #include <Phonon/Path> + #include <Phonon/Global> + #else //!COMPILE_KDE_SUPPORT + #include <Phonon> + #endif //!COMPILE_KDE_SUPPORT Phonon::MediaObject * g_pPhononPlayer=0; #endif //!COMPILE_PHONON_SUPPORT @@ -232,7 +238,7 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName) #ifdef COMPILE_ON_WINDOWS bool KviSoundPlayer::playWinmm(const QString &szFileName) { - sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT); + sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT); return true; // This does not compile on win! /*if(isMuted()) return true; diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h index 16404c11a..6ad4e8929 100644 --- a/src/modules/snd/libkvisnd.h +++ b/src/modules/snd/libkvisnd.h @@ -117,7 +117,7 @@ protected: }; #ifdef COMPILE_PHONON_SUPPORT -class KviArtsSoundThread : public KviSoundThread +class KviPhononSoundThread : public KviSoundThread { public: KviPhononSoundThread(const QString &szFileName); @@ -199,6 +199,9 @@ protected: void unregisterSoundThread(KviSoundThread * t); virtual bool event(QEvent *e); protected: +#ifdef COMPILE_PHONON_SUPPORT + bool playPhonon(const QString &szFileName); +#endif //!COMPILE_PHONON_SUPPORT #ifdef COMPILE_ON_WINDOWS bool playWinmm(const QString &szFileName); #else //!COMPILE_ON_WINDOWS |