slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restructure the source code a little.

Browse Source 
Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-04 16:05:55 +10:00
committed by Qt by Nokia
parent 6ee1977d60
commit 502d3c8eb3
123 changed files with 198 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/multimedia/audio/audio.pri
View File

@@ -1,17 +1,24 @@
INCLUDEPATH += audio
PUBLIC_HEADERS += audio/qaudio.h \
PUBLIC_HEADERS += \
audio/qaudio.h \
audio/qaudioformat.h \
audio/qaudioinput.h \
audio/qaudiooutput.h \
audio/qaudiodeviceinfo.h \
audio/qaudiosystemplugin.h \
audio/qaudiosystem.h
audio/qaudiosystem.h \
audio/qsoundeffect.h \
audio/qsound.h
PRIVATE_HEADERS += audio/qaudiodevicefactory_p.h audio/qaudiopluginloader_p.h
PRIVATE_HEADERS += \
audio/qaudiodevicefactory_p.h \
audio/qaudiopluginloader_p.h \
audio/qwavedecoder_p.h \
audio/qsamplecache_p.h
SOURCES += audio/qaudio.cpp \
SOURCES += \
audio/qaudio.cpp \
audio/qaudioformat.cpp \
audio/qaudiodeviceinfo.cpp \
audio/qaudiooutput.cpp \
@@ -19,7 +26,11 @@ SOURCES += audio/qaudio.cpp \
audio/qaudiosystemplugin.cpp \
audio/qaudiosystem.cpp \
audio/qaudiodevicefactory.cpp \
audio/qaudiopluginloader.cpp
audio/qaudiopluginloader.cpp \
audio/qsoundeffect.cpp \
audio/qwavedecoder_p.cpp \
audio/qsamplecache_p.cpp \
audio/qsound.cpp
mac {
PRIVATE_HEADERS += audio/qaudioinput_mac_p.h \
@@ -46,15 +57,29 @@ win32 {
unix:!mac {
contains(config_test_pulseaudio, yes) {
DEFINES += QT_NO_AUDIO_BACKEND
}
else:contains(config_test_alsa, yes) {
linux-*|freebsd-*|openbsd-* {
CONFIG += link_pkgconfig
PKGCONFIG += libpulse
DEFINES += QT_MULTIMEDIA_PULSEAUDIO
PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h
SOURCES += audio/qsoundeffect_pulse_p.cpp
!maemo*:DEFINES += QTM_PULSEAUDIO_DEFAULTBUFFER
} else {
DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h
SOURCES += audio/qsoundeffect_qmedia_p.cpp
contains(config_test_alsa, yes):linux-*|freebsd-*|openbsd-* {
DEFINES += HAS_ALSA
PRIVATE_HEADERS += audio/qaudiooutput_alsa_p.h audio/qaudioinput_alsa_p.h audio/qaudiodeviceinfo_alsa_p.h
SOURCES += audio/qaudiodeviceinfo_alsa_p.cpp \
audio/qaudiooutput_alsa_p.cpp \
audio/qaudioinput_alsa_p.cpp
audio/qaudiooutput_alsa_p.cpp \
audio/qaudioinput_alsa_p.cpp
LIBS_PRIVATE += -lasound
}
}
} else {
DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h
SOURCES += audio/qsoundeffect_qmedia_p.cpp
}