[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2012-02-15 18:49:29
Message-ID: 20120215184929.AF061AC894 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1280234 by majewsky:

import TagaroAudio into libkdegames as KgAudio

 M  +4 -1      CMakeLists.txt  
 A             cmake/modules/FindSndFile.cmake  
 M  +12 -1     libkdegames/CMakeLists.txt  
 A             libkdegames/audio (directory)  
 A             libkdegames/audio/CMakeLists.txt  
 A             libkdegames/audio/kgaudioscene-openal.cpp   [License: LGPL (v2)]
 A             libkdegames/audio/kgaudioscene-phonon.cpp   [License: LGPL (v2)]
 A             libkdegames/audio/kgaudioscene.h   [License: LGPL (v2)]
 A             libkdegames/audio/kgopenalruntime_p.h   [License: LGPL (v2)]
 A             libkdegames/audio/kgsound-openal.cpp   [License: LGPL (v2)]
 A             libkdegames/audio/kgsound-phonon.cpp   [License: LGPL (v2)]
 A             libkdegames/audio/kgsound.h   [License: LGPL (v2)]
 M  +2 -0      libkdegames/includes/CMakeLists.txt  
 A             libkdegames/includes/KgAudioScene  
 A             libkdegames/includes/KgSound  


--- trunk/KDE/kdegames/CMakeLists.txt #1280233:1280234
@@ -19,8 +19,11 @@
 macro_log_feature(PYTHONINTERP_FOUND "Python" "Programming language that lets you work more quickly and \
integrate your systems more effectively." "http://python.org" FALSE "" "Kajongg will not be built without \
the python interpreter (version 2.6 < 3.0).")  
 macro_optional_find_package(OpenAL)
-macro_log_feature(OPENAL_FOUND "OpenAL" "OpenAL (Open Audio Library) is a free software cross-platform \
audio API." "http://connect.creativelabs.com/openal" FALSE "" "KGoldrunner and Granatier need OpenAL for \
sound output. If OpenAL cannot be provided on some platform or distribution, please email the KDE Games \
list <kde-games-devel at kde dot org>.") +macro_log_feature(OPENAL_FOUND "OpenAL" "OpenAL (Open Audio \
Library) is a free software cross-platform audio API." "http://connect.creativelabs.com/openal" FALSE "" \
"Phonon is used as a fallback, but low-latency sound output is only available with OpenAL/SndFile.")  
+macro_optional_find_package(SndFile)
+macro_log_feature(SNDFILE_FOUND "SndFile" "libsndfile is a C library written by Erik de Castro Lopo for \
reading and writing audio files." "http://www.mega-nerd.com/libsndfile/" TRUE "" "Phonon is used as a \
fallback, but low-latency sound output is only available with OpenAL/SndFile.") +
 if(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
     set(OPENGL_SUPPORT true)
 endif(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
--- trunk/KDE/kdegames/libkdegames/CMakeLists.txt #1280233:1280234
@@ -19,9 +19,20 @@
    ${CMAKE_CURRENT_BINARY_DIR}/highscore
 )
 
+if (OPENAL_FOUND AND SNDFILE_FOUND)
+    include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIRS})
+    set(KGAUDIO_LINKLIBS ${OPENAL_LIBRARY} ${SNDFILE_LIBRARIES})
+    set(KGAUDIO_BACKEND openal)
+else (OPENAL_FOUND AND SNDFILE_FOUND)
+    set(KGAUDIO_LINKLIBS ${KDE4_PHONON_LIBS})
+    set(KGAUDIO_BACKEND phonon)
+endif (OPENAL_FOUND AND SNDFILE_FOUND)
+
 ########### next target ###############
 
 set(kdegames_LIB_SRCS
+    audio/kgaudioscene-${KGAUDIO_BACKEND}.cpp
+    audio/kgsound-${KGAUDIO_BACKEND}.cpp
     colorproxy_p.cpp
 #   highscore/kconfigrawbackend.cpp
     highscore/kexthighscore_item.cpp
@@ -82,7 +93,7 @@
 
 kde4_add_library(kdegames SHARED ${kdegames_LIB_SRCS})
 
-target_link_libraries(kdegames ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} \
${KDE4_KNEWSTUFF3_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) +target_link_libraries(kdegames \
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${QT_QTXML_LIBRARY} \
${QT_QTNETWORK_LIBRARY} ${KGAUDIO_LINKLIBS})  target_link_libraries(kdegames LINK_INTERFACE_LIBRARIES \
${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} )  
 #NOTE: 6.0.0 = KDE 4.9 release, please increase minor version in next minor KDE SC version if API \
                changes
--- trunk/KDE/kdegames/libkdegames/includes/CMakeLists.txt #1280233:1280234
@@ -1,5 +1,7 @@
 
 install( FILES 
+	KgAudioScene
+	KgSound
 	KCardDialog
 	KChat
 	KChatBase


[prev in list] [next in list] [prev in thread] [next in thread]