From 39e6da8f8ea81e3b7c5ba47e9e3cc92ee2051925 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Wed, 11 Jan 2012 14:45:11 +1000
Subject: [PATCH] Enable building the documentation snippets.

Change-Id: Ib7ef5a564408092ecd72be5d855b2defaddf9c4e
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 .../snippets/multimedia-snippets/audiorecorder.cpp  |  6 ++----
 doc/src/snippets/multimedia-snippets/media.cpp      | 21 +++------------------
 .../multimedia-snippets/multimedia-snippets.pro     | 10 +++++++---
 doc/src/snippets/multimedia-snippets/qsound.cpp     | 19 ++++++++++++-------
 qtmultimedia.pro                                    | 11 ++++++++++-
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
index 85cbfa5..81f4778 100644
--- a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
+++ b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
@@ -41,8 +41,7 @@
 
 #include <QtWidgets>
 
-#include <qaudiocapturesource.h>
-#include <qmediarecorder.h>
+#include <qaudiorecorder.h>
 #include <qmediaservice.h>
 
 #include <QtMultimedia/qaudioformat.h>
@@ -52,8 +51,7 @@
 AudioRecorder::AudioRecorder()
 {
 //! [create-objs-1]
-    audiosource = new QAudioCaptureSource;
-    capture = new QMediaRecorder(audiosource);
+    capture = new QAudioRecorder();
 //! [create-objs-1]
 
     // set a default file
diff --git a/doc/src/snippets/multimedia-snippets/media.cpp b/doc/src/snippets/multimedia-snippets/media.cpp
index 2e25528..005e25f 100644
--- a/doc/src/snippets/multimedia-snippets/media.cpp
+++ b/doc/src/snippets/multimedia-snippets/media.cpp
@@ -43,7 +43,6 @@
 #include <QFile>
 #include <QTimer>
 
-#include "qaudiocapturesource.h"
 #include "qmediaplaylist.h"
 #include "qmediarecorder.h"
 #include "qmediaservice.h"
@@ -54,11 +53,11 @@
 #include "qradiotuner.h"
 #include "qvideowidget.h"
 #include "qcameraimagecapture.h"
+#include "qcamera.h"
 
 class MediaExample : public QObject {
     Q_OBJECT
 
-    void AudioCaptureSource();
     void MediaControl();
     void MediaImageViewer();
     void MediaPlayer();
@@ -77,8 +76,8 @@ private:
     QMediaContent video;
     QMediaRecorder *recorder;
     QMediaImageViewer *viewer;
+    QCamera *camera;
     QCameraImageCapture *imageCapture;
-    QAudioCaptureSource *audioSource;
     QString fileName;
     QRadioTuner *radio;
     QMediaContent image1;
@@ -88,19 +87,6 @@ private:
     static const int yourRadioStationFrequency = 11;
 };
 
-void MediaExample::AudioCaptureSource()
-{
-    //! [Audio capture source]
-    QAudioCaptureSource* audioSource = new QAudioCaptureSource;
-    QMediaRecorder* recorder = new QMediaRecorder(audioSource);
-
-    recorder->setOutputLocation(QUrl("test.raw"));
-    //! [Audio capture source]
-
-    Q_UNUSED(audioSource);
-}
-
-
 void MediaExample::MediaControl()
 {
     {
@@ -205,8 +191,7 @@ void MediaExample::MediaRecorder()
 {
     //! [Media recorder]
     // Audio only recording
-    audioSource = new QAudioCaptureSource;
-    recorder = new QMediaRecorder(audioSource);
+    recorder = new QMediaRecorder(camera);
 
     QAudioEncoderSettings audioSettings;
     audioSettings.setCodec("audio/vorbis");
diff --git a/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro b/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
index bf5c094..618e9ee 100644
--- a/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
+++ b/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
@@ -7,14 +7,18 @@ INCLUDEPATH += ../../../../src/global \
                ../../../../src/multimedia \
                ../../../../src/multimedia/audio \
                ../../../../src/multimedia/video \
-               ../../../../src/multimedia/effects
+               ../../../../src/multimedia/camera
 
 CONFIG += console
 
-QT += multimedia
+QT += multimedia multimediawidgets
 
 SOURCES += \
     audio.cpp \
     video.cpp \
     camera.cpp \
-    media.cpp
+    media.cpp \
+    qsound.cpp
+
+OTHER_FILES += \
+    soundeffect.qml
diff --git a/doc/src/snippets/multimedia-snippets/qsound.cpp b/doc/src/snippets/multimedia-snippets/qsound.cpp
index 133b155..b5e235c 100644
--- a/doc/src/snippets/multimedia-snippets/qsound.cpp
+++ b/doc/src/snippets/multimedia-snippets/qsound.cpp
@@ -38,12 +38,17 @@
 **
 ****************************************************************************/
 
-//! [0]
-QSound::play("mysounds/bells.wav");
-//! [0]
 
+#include "qsound.h"
 
-//! [1]
-QSound bells("mysounds/bells.wav");
-bells.play();
-//! [1]
+void qsoundsnippet() {
+    //! [0]
+    QSound::play("mysounds/bells.wav");
+    //! [0]
+
+
+    //! [1]
+    QSound bells("mysounds/bells.wav");
+    bells.play();
+    //! [1]
+}
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 0a2ca05..6aa52f1 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -16,8 +16,17 @@ module_qtmultimedia_tests.depends = module_qtmultimedia_src
 module_qtmultimedia_tests.CONFIG = no_default_install
 !contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
 
+module_qtmultimedia_docsnippets.subdir = doc
+module_qtmultimedia_docsnippets.target = module-qtmultimedia-doc
+module_qtmultimedia_docsnippets.depends = module_qtmultimedia_src
+module_qtmultimedia_docsnippets.CONFIG = no_default_install
+
 SUBDIRS += module_qtmultimedia_src \
            module_qtmultimedia_examples \
-           module_qtmultimedia_tests \
+           module_qtmultimedia_tests
+
+# Doc snippets use widgets
+!isEmpty(QT.widgets.name): SUBDIRS += module_qtmultimedia_docsnippets
 
+# for make docs:
 include(doc/config/qtmultimedia_doc.pri)
-- 
2.7.4