diff options
15 files changed, 22 insertions, 27 deletions
diff --git a/doc/src/audiooverview.qdoc b/doc/src/audiooverview.qdoc index 378447692..b27f358ac 100644 --- a/doc/src/audiooverview.qdoc +++ b/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 -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 +removed before the final 5.0 release. \section2 Recording audio to a file For recording audio to a file, the \l {QAudioRecorder} class allows you diff --git a/doc/src/snippets/multimedia-snippets/audio.cpp b/doc/src/snippets/multimedia-snippets/audio.cpp index d25c05efa..29bf5c8b8 100644 --- a/doc/src/snippets/multimedia-snippets/audio.cpp +++ b/doc/src/snippets/multimedia-snippets/audio.cpp @@ -48,10 +48,7 @@ #include "qaudioinput.h" #include "qaudiooutput.h" #include "qaudioprobe.h" - -//! [Audio decoder header] -#include "qaudiodecoder_p.h" -//! [Audio decoder header] +#include "qaudiodecoder.h" class AudioInputExample : public QObject { Q_OBJECT diff --git a/examples/audiodecoder/audiodecoder.h b/examples/audiodecoder/audiodecoder.h index 63dd8233f..a9501910a 100644 --- a/examples/audiodecoder/audiodecoder.h +++ b/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> diff --git a/examples/examples.pro b/examples/examples.pro index 164200f58..60fc9c433 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -6,6 +6,7 @@ TEMPLATE = subdirs radio \ camera \ spectrum \ + audiodecoder \ audiorecorder \ audiodevices \ audioinput \ diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index b58ecbb0c..fedfc97cd 100644 --- a/src/multimedia/audio/audio.pri +++ b/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 \ diff --git a/src/multimedia/audio/qaudiodecoder_p.cpp b/src/multimedia/audio/qaudiodecoder.cpp index b0d57ee8f..1253deb8c 100644 --- a/src/multimedia/audio/qaudiodecoder_p.cpp +++ b/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 diff --git a/src/multimedia/audio/qaudiodecoder_p.h b/src/multimedia/audio/qaudiodecoder.h index a671f19df..a671f19df 100644 --- a/src/multimedia/audio/qaudiodecoder_p.h +++ b/src/multimedia/audio/qaudiodecoder.h diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index 69094f766..bf2118794 100644 --- a/src/multimedia/controls/controls.pri +++ b/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 diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index d2e1c7e4f..f8e7a0f3f 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.cpp +++ b/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 diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.h b/src/multimedia/controls/qaudiodecodercontrol.h index 00f6f9552..0c26e68b6 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.h +++ b/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> diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h index bee39aa2d..57429e226 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h @@ -47,8 +47,8 @@ #include <qaudioformat.h> #include <qaudiobuffer.h> -#include <private/qaudiodecoder_p.h> -#include <private/qaudiodecodercontrol_p.h> +#include <qaudiodecoder.h> +#include <qaudiodecodercontrol.h> #include <limits.h> diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h index 2c491cbaa..301123d13 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h +++ b/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" diff --git a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp index e4370198d..a901520e5 100644 --- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp +++ b/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" diff --git a/tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp b/tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp index edc250199..43c51e35c 100644 --- a/tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp +++ b/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" diff --git a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h index f0b0adc54..c0313da4a 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h +++ b/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> |