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

Replace QSoundEffect backend using qmedia with qaudiooutput implementation

Browse Source 
- Use backend built on QAudioOutput
- Fixed unit test so backend will pass

Change-Id: I2f2a7d8bf382127c5a5c333d6e36c79169754b4e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
This commit is contained in:
Kurt Korbatits
2012-07-18 15:39:20 +10:00
committed by Qt by Nokia
parent 6ebee9f57e
commit b976589a66
6 changed files with 498 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,9 +72,9 @@ unix:!mac {
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
DEFINES += QT_MULTIMEDIA_QAUDIO
PRIVATE_HEADERS += audio/qsoundeffect_qaudio_p.h
SOURCES += audio/qsoundeffect_qaudio_p.cpp
config_alsa {
DEFINES += HAS_ALSA
@@ -86,7 +86,7 @@ unix:!mac {
}
}
} else {
DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h
SOURCES += audio/qsoundeffect_qmedia_p.cpp
DEFINES += QT_MULTIMEDIA_QAUDIO
PRIVATE_HEADERS += audio/qsoundeffect_qaudio_p.h
SOURCES += audio/qsoundeffect_qaudio_p.cpp
}