Move QAudioDecoder to public.

To get better feedback between alpha & beta.

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

doc/src/audiooverview.qdoc

@@ -106,10 +106,7 @@ Here's an example of decoding a local file:
     \snippet doc/src/snippets/multimedia-snippets/audio.cpp Local audio decoding
 
 Note:  This API is preliminary at this time - the API may change or be
-removed before the final 5.0 release.  In addition, it is necessary to
+removed before the final 5.0 release.
-add "multimedia-private" to the QT variable in your .pro file to use this class.
-
-    \snippet doc/src/snippets/multimedia-snippets/audio.cpp Audio decoder header
 
 \section2 Recording audio to a file
 For recording audio to a file, the \l {QAudioRecorder} class allows you

doc/src/snippets/multimedia-snippets/audio.cpp

@@ -48,10 +48,7 @@
 #include "qaudioinput.h"
 #include "qaudiooutput.h"
 #include "qaudioprobe.h"
-
+#include "qaudiodecoder.h"
-//! [Audio decoder header]
-#include "qaudiodecoder_p.h"
-//! [Audio decoder header]
 
 class AudioInputExample : public QObject {
     Q_OBJECT

examples/audiodecoder/audiodecoder.h

@@ -41,7 +41,7 @@
 #ifndef AUDIODECODER_H
 #define AUDIODECODER_H
 
-#include <private/qaudiodecoder_p.h>
+#include <qaudiodecoder.h>
 #include "wavefilewriter.h"
 #include <QSoundEffect>
 #include <QTextStream>

examples/examples.pro

@@ -6,6 +6,7 @@ TEMPLATE = subdirs
         radio \
         camera \
         spectrum \
+        audiodecoder \
         audiorecorder \
         audiodevices \
         audioinput \

src/multimedia/audio/audio.pri

@@ -11,14 +11,14 @@ PUBLIC_HEADERS += \
            audio/qaudiosystem.h  \
            audio/qsoundeffect.h \
            audio/qsound.h \
-           audio/qaudioprobe.h
+           audio/qaudioprobe.h \
+           audio/qaudiodecoder.h
 
 PRIVATE_HEADERS += \
            audio/qaudiobuffer_p.h \
            audio/qaudiodevicefactory_p.h \
            audio/qwavedecoder_p.h \
            audio/qsamplecache_p.h \
-           audio/qaudiodecoder_p.h
 
 SOURCES += \
            audio/qaudio.cpp \
@@ -35,7 +35,7 @@ SOURCES += \
            audio/qsound.cpp \
            audio/qaudiobuffer.cpp \
            audio/qaudioprobe.cpp \
-           audio/qaudiodecoder_p.cpp
+           audio/qaudiodecoder.cpp
 
 mac {
     PRIVATE_HEADERS +=  audio/qaudioinput_mac_p.h \

src/multimedia/audio/qaudiodecoder.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qaudiodecoder_p.h"
+#include "qaudiodecoder.h"
 
 #include "qmediaobject_p.h"
 #include <qmediaservice.h>
-#include "qaudiodecodercontrol_p.h"
+#include "qaudiodecodercontrol.h"
 #include <private/qmediaserviceprovider_p.h>
 
 #include <QtCore/qcoreevent.h>
@@ -542,6 +542,6 @@ QAudioBuffer QAudioDecoder::read() const
     \brief the active filename being decoded by the decoder object.
 */
 
-#include "moc_qaudiodecoder_p.cpp"
+#include "moc_qaudiodecoder.cpp"
 QT_END_NAMESPACE
 

src/multimedia/controls/controls.pri

@@ -2,6 +2,7 @@
 INCLUDEPATH += controls
 
 PUBLIC_HEADERS += \
+    controls/qaudiodecodercontrol.h \
     controls/qaudioencodercontrol.h \
     controls/qcameracapturebufferformatcontrol.h \
     controls/qcameracapturedestinationcontrol.h \
@@ -34,7 +35,6 @@ PUBLIC_HEADERS += \
     controls/qmediaavailabilitycontrol.h
 
 PRIVATE_HEADERS += \
-    controls/qaudiodecodercontrol_p.h \
     controls/qmediaplaylistcontrol_p.h \
     controls/qmediaplaylistsourcecontrol_p.h
 
@@ -70,7 +70,7 @@ SOURCES += \
     controls/qvideorenderercontrol.cpp \
     controls/qmediaaudioprobecontrol.cpp \
     controls/qmediavideoprobecontrol.cpp \
-    controls/qaudiodecodercontrol_p.cpp \
+    controls/qmediaavailabilitycontrol.cpp \
-    controls/qmediaavailabilitycontrol.cpp
+    controls/qaudiodecodercontrol.cpp
 
 

src/multimedia/controls/qaudiodecodercontrol.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmediacontrol_p.h"
-#include "qaudiodecodercontrol_p.h"
+#include "qaudiodecodercontrol.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -264,6 +264,6 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent):
     or -1 if not available.
 */
 
-#include "moc_qaudiodecodercontrol_p.cpp"
+#include "moc_qaudiodecodercontrol.cpp"
 QT_END_NAMESPACE
 

src/multimedia/controls/qaudiodecodercontrol.h

@@ -43,7 +43,7 @@
 #define QAUDIODECODERCONTROL_H
 
 #include "qmediacontrol.h"
-#include <private/qaudiodecoder_p.h>
+#include "qaudiodecoder.h"
 
 #include <QtCore/qpair.h>
 

src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h

@@ -47,8 +47,8 @@
 
 #include <qaudioformat.h>
 #include <qaudiobuffer.h>
-#include <private/qaudiodecoder_p.h>
+#include <qaudiodecoder.h>
-#include <private/qaudiodecodercontrol_p.h>
+#include <qaudiodecodercontrol.h>
 
 #include <limits.h>
 

src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h

@@ -46,7 +46,7 @@
 #include <QtCore/qmutex.h>
 #include "qgstreameraudiodecodercontrol.h"
 #include <private/qgstreamerbushelper_p.h>
-#include <private/qaudiodecoder_p.h>
+#include "qaudiodecoder.h"
 
 #if defined(HAVE_GST_APPSRC)
 #include "qgstappsrc.h"

tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp

@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 #include <QDebug>
-#include "qaudiodecoder_p.h"
+#include "qaudiodecoder.h"
 
 #define TEST_FILE_NAME "testdata/test.wav"
 

tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp

@@ -43,7 +43,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include "qaudiodecoder_p.h"
+#include "qaudiodecoder.h"
 #include "mockaudiodecoderservice.h"
 #include "mockmediaserviceprovider.h"
 

tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h

@@ -43,7 +43,7 @@
 #define MOCKAUDIODECODERCONTROL_H
 
 #include "qmediacontrol.h"
-#include <private/qaudiodecodercontrol_p.h>
+#include "qaudiodecodercontrol.h"
 
 #include <QtCore/qpair.h>