Restructure the source code a little.

Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

src/multimedia/audio/audio.pri

@@ -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 += \
-SOURCES += audio/qaudio.cpp \
+           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
-    }
+        CONFIG += link_pkgconfig
-    else:contains(config_test_alsa, yes) {
+        PKGCONFIG += libpulse
-        linux-*|freebsd-*|openbsd-* {
+
+        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/qaudiooutput_alsa_p.cpp \
-                   audio/qaudioinput_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
 }

src/multimedia/camera/camera.pri

@@ -0,0 +1,16 @@
+INCLUDEPATH += camera
+
+PUBLIC_HEADERS += \
+    camera/qcamera.h \
+    camera/qcameraimagecapture.h \
+    camera/qcameraexposure.h \
+    camera/qcamerafocus.h \
+    camera/qcameraimageprocessing.h
+
+SOURCES += \
+    camera/qcamera.cpp \
+    camera/qcameraexposure.cpp \
+    camera/qcamerafocus.cpp \
+    camera/qcameraimageprocessing.cpp \
+    camera/qcameraimagecapture.cpp
+

src/multimedia/controls/controls.pri

@@ -0,0 +1,60 @@
+
+INCLUDEPATH += controls
+
+PUBLIC_HEADERS += \
+    controls/qaudioencodercontrol.h \
+    controls/qcameracapturebufferformatcontrol.h \
+    controls/qcameracapturedestinationcontrol.h \
+    controls/qcameracontrol.h \
+    controls/qcameraexposurecontrol.h \
+    controls/qcameraflashcontrol.h \
+    controls/qcamerafocuscontrol.h \
+    controls/qcameraimagecapturecontrol.h \
+    controls/qcameraimageprocessingcontrol.h \
+    controls/qcameralockscontrol.h \
+    controls/qimageencodercontrol.h \
+    controls/qmediabackgroundplaybackcontrol.h \
+    controls/qmediacontainercontrol.h \
+    controls/qmediagaplessplaybackcontrol.h \
+    controls/qmedianetworkaccesscontrol.h \
+    controls/qmediaplayercontrol.h \
+    controls/qmediaplaylistcontrol.h \
+    controls/qmediaplaylistsourcecontrol.h \
+    controls/qmediarecordercontrol.h \
+    controls/qmediastreamscontrol.h \
+    controls/qmetadatareadercontrol.h \
+    controls/qmetadatawritercontrol.h \
+    controls/qradiodatacontrol.h \
+    controls/qradiotunercontrol.h \
+    controls/qvideodevicecontrol.h \
+    controls/qvideoencodercontrol.h \
+    controls/qvideorenderercontrol.h
+
+SOURCES += \
+    controls/qaudioencodercontrol.cpp \
+    controls/qcameracapturebufferformatcontrol.cpp \
+    controls/qcameracapturedestinationcontrol.cpp \
+    controls/qcameracontrol.cpp \
+    controls/qcameraexposurecontrol.cpp \
+    controls/qcameraflashcontrol.cpp \
+    controls/qcamerafocuscontrol.cpp \
+    controls/qcameraimagecapturecontrol.cpp \
+    controls/qcameraimageprocessingcontrol.cpp \
+    controls/qcameralockscontrol.cpp \
+    controls/qimageencodercontrol.cpp \
+    controls/qmediabackgroundplaybackcontrol.cpp \
+    controls/qmediacontainercontrol.cpp \
+    controls/qmediagaplessplaybackcontrol.cpp \
+    controls/qmedianetworkaccesscontrol.cpp \
+    controls/qmediaplayercontrol.cpp \
+    controls/qmediaplaylistcontrol.cpp \
+    controls/qmediaplaylistsourcecontrol.cpp \
+    controls/qmediarecordercontrol.cpp \
+    controls/qmediastreamscontrol.cpp \
+    controls/qmetadatareadercontrol.cpp \
+    controls/qmetadatawritercontrol.cpp \
+    controls/qradiodatacontrol.cpp \
+    controls/qradiotunercontrol.cpp \
+    controls/qvideodevicecontrol.cpp \
+    controls/qvideoencodercontrol.cpp \
+    controls/qvideorenderercontrol.cpp

src/multimedia/effects/effects.pri

@@ -1,37 +0,0 @@
-INCLUDEPATH += effects
-
-unix:!mac {
-   contains(config_test_pulseaudio, yes) {
-        CONFIG += link_pkgconfig
-        PKGCONFIG += libpulse
-
-        DEFINES += QT_MULTIMEDIA_PULSEAUDIO
-        PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
-        SOURCES += effects/qsoundeffect_pulse_p.cpp
-        !maemo*:DEFINES += QTM_PULSEAUDIO_DEFAULTBUFFER
-    } else {
-        DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-        PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
-        SOURCES += effects/qsoundeffect_qmedia_p.cpp
-    }
-} else {
-    DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-    PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
-    SOURCES += effects/qsoundeffect_qmedia_p.cpp
-}
-
-PUBLIC_HEADERS += \
-        effects/qsoundeffect.h \
-        effects/qsound.h
-
-PRIVATE_HEADERS += \
-        effects/qwavedecoder_p.h \
-        effects/qsamplecache_p.h
-
-SOURCES += \
-    effects/qsoundeffect.cpp \
-    effects/qwavedecoder_p.cpp \
-    effects/qsamplecache_p.cpp \
-    effects/qsound.cpp
-
-HEADERS +=

src/multimedia/imageviewer/imageviewer.pri

@@ -0,0 +1,13 @@
+
+INCLUDEPATH += imageviewer
+
+PUBLIC_HEADERS += \
+    imageviewer/qmediaimageviewer.h
+
+PRIVATE_HEADERS += \
+    imageviewer/qmediaimageviewerservice_p.h
+
+SOURCES += \
+    imageviewer/qmediaimageviewer.cpp \
+    imageviewer/qmediaimageviewerservice.cpp
+

src/multimedia/multimedia.pro

@@ -19,141 +19,44 @@ load(qt_module_config)
 
 HEADERS += qtmultimediaversion.h
 
+INCLUDEPATH *= .
+
 PRIVATE_HEADERS += \
     qmediacontrol_p.h \
     qmediaobject_p.h \
-    qmediaservice_p.h  \
-    qmediaplaylist_p.h \
-    qmediaplaylistprovider_p.h \
-    qmediaimageviewerservice_p.h \
     qmediapluginloader_p.h \
-    qvideosurfaceoutput_p.h
+    qmediaservice_p.h \
 
 PUBLIC_HEADERS += \
+    qmediabindableinterface.h \
     qmediacontrol.h \
+    qmediaenumdebug.h \
     qmediaobject.h \
     qmediaservice.h \
-    qmediabindableinterface.h \
-    qlocalmediaplaylistprovider.h \
-    qmediaimageviewer.h \
-    qmediaplayer.h \
-    qmediaplayercontrol.h \
-    qmediaplaylist.h \
-    qmediaplaylistnavigator.h \
-    qmediaplaylistprovider.h \
-    qmediaplaylistioplugin.h \
-    qmediabackgroundplaybackcontrol.h \
-    qmediacontent.h \
-    qmediaresource.h \
-    qmediarecorder.h \
-    qmediaencodersettings.h \
-    qmediarecordercontrol.h \
     qmediaserviceprovider.h \
     qmediaserviceproviderplugin.h \
-    qmetadatareadercontrol.h \
-    qmetadatawritercontrol.h \
-    qmediastreamscontrol.h \
-    qradiotuner.h \
-    qradiodata.h \
-    qradiotunercontrol.h \
-    qradiodatacontrol.h \
-    qtmedianamespace.h \
-    qaudioencodercontrol.h \
-    qvideoencodercontrol.h \
-    qimageencodercontrol.h \
-    qaudiocapturesource.h \
-    qmediacontainercontrol.h \
-    qmediaplaylistcontrol.h \
-    qmediaplaylistsourcecontrol.h \
-    qaudioendpointselector.h \
-    qvideodevicecontrol.h \
-    qvideorenderercontrol.h \
     qmediatimerange.h \
-    qmedianetworkaccesscontrol.h \
+    qtmedianamespace.h \
-    qmediaenumdebug.h \
     qtmultimediadefs.h \
-    qmediagaplessplaybackcontrol.h
-
-SOURCES += qmediacontrol.cpp \
-    qmediaobject.cpp \
-    qmediaservice.cpp \
-    qmediabindableinterface.cpp \
-    qlocalmediaplaylistprovider.cpp \
-    qmediaimageviewer.cpp \
-    qmediaimageviewerservice.cpp \
-    qmediaplayer.cpp \
-    qmediaplayercontrol.cpp \
-    qmediaplaylist.cpp \
-    qmediaplaylistioplugin.cpp \
-    qmediaplaylistnavigator.cpp \
-    qmediaplaylistprovider.cpp \
-    qmediarecorder.cpp \
-    qmediaencodersettings.cpp \
-    qmediarecordercontrol.cpp \
-    qmediacontent.cpp \
-    qmediaresource.cpp \
-    qmediaserviceprovider.cpp \
-    qmetadatareadercontrol.cpp \
-    qmetadatawritercontrol.cpp \
-    qmediastreamscontrol.cpp \
-    qradiotuner.cpp \
-    qradiodata.cpp \
-    qradiotunercontrol.cpp \
-    qradiodatacontrol.cpp \
-    qaudioencodercontrol.cpp \
-    qvideoencodercontrol.cpp \
-    qimageencodercontrol.cpp \
-    qaudiocapturesource.cpp \
-    qmediacontainercontrol.cpp \
-    qmediaplaylistcontrol.cpp \
-    qmediaplaylistsourcecontrol.cpp \
-    qaudioendpointselector.cpp \
-    qvideodevicecontrol.cpp \
-    qmediapluginloader.cpp \
-    qvideorenderercontrol.cpp \
-    qmediatimerange.cpp \
-    qmedianetworkaccesscontrol.cpp \
-    qvideosurfaceoutput.cpp \
-    qmediabackgroundplaybackcontrol.cpp \
-    qtmedianamespace.cpp \
-    qmediagaplessplaybackcontrol.cpp
-
-#Camera
-PUBLIC_HEADERS += \
-    qcamera.h \
-    qcameraimagecapture.h \
-    qcameraimagecapturecontrol.h \
-    qcameraexposure.h \
-    qcamerafocus.h \
-    qcameraimageprocessing.h \
-    qcameracontrol.h \
-    qcameralockscontrol.h \
-    qcameraexposurecontrol.h \
-    qcamerafocuscontrol.h \
-    qcameraflashcontrol.h \
-    qcameraimageprocessingcontrol.h \
-    qcameracapturedestinationcontrol.h \
-    qcameracapturebufferformatcontrol.h
 
 SOURCES += \
-    qcamera.cpp \
+    qmediabindableinterface.cpp \
-    qcameraexposure.cpp \
+    qmediacontrol.cpp \
-    qcamerafocus.cpp \
+    qmediaobject.cpp \
-    qcameraimageprocessing.cpp \
+    qmediapluginloader.cpp \
-    qcameraimagecapture.cpp \
+    qmediaservice.cpp \
-    qcameraimagecapturecontrol.cpp \
+    qmediaserviceprovider.cpp \
-    qcameracontrol.cpp \
+    qmediatimerange.cpp \
-    qcameralockscontrol.cpp \
+    qtmedianamespace.cpp
-    qcameraexposurecontrol.cpp \
-    qcamerafocuscontrol.cpp \
-    qcameraflashcontrol.cpp \
-    qcameraimageprocessingcontrol.cpp \
-    qcameracapturedestinationcontrol.cpp \
-    qcameracapturebufferformatcontrol.cpp
 
 include(audio/audio.pri)
+include(camera/camera.pri)
+include(controls/controls.pri)
+include(imageviewer/imageviewer.pri)
+include(playback/playback.pri)
+include(radio/radio.pri)
+include(recording/recording.pri)
 include(video/video.pri)
-include(effects/effects.pri)
 
 mac {
    LIBS += -framework AppKit -framework QuartzCore -framework QTKit

src/multimedia/playback/playback.pri

@@ -0,0 +1,27 @@
+INCLUDEPATH += playback
+
+PUBLIC_HEADERS += \
+    playback/qaudioendpointselector.h \
+    playback/qlocalmediaplaylistprovider.h \
+    playback/qmediacontent.h \
+    playback/qmediaplayer.h \
+    playback/qmediaplaylist.h \
+    playback/qmediaplaylistioplugin.h \
+    playback/qmediaplaylistnavigator.h \
+    playback/qmediaplaylistprovider.h \
+    playback/qmediaresource.h
+
+PRIVATE_HEADERS += \
+    playback/qmediaplaylist_p.h \
+    playback/qmediaplaylistprovider_p.h
+
+SOURCES += \
+    playback/qaudioendpointselector.cpp \
+    playback/qlocalmediaplaylistprovider.cpp \
+    playback/qmediacontent.cpp \
+    playback/qmediaplayer.cpp \
+    playback/qmediaplaylist.cpp \
+    playback/qmediaplaylistioplugin.cpp \
+    playback/qmediaplaylistnavigator.cpp \
+    playback/qmediaplaylistprovider.cpp \
+    playback/qmediaresource.cpp