Replace QSoundEffect backend using qmedia with qaudiooutput implementation

- 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>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index 6fc99f9b5..73a9d6519 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -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
 }