diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-04-10 21:33:00 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 03:32:00 +0200 |
| commit | e057fd9e8a68aa7ab5cbe3cfd8d6f9f787107dcd (patch) | |
| tree | c2a30e599652a3195b77841ba241157e45701941 /src/multimedia/controls | |
| parent | 8484b0ff9c40fe70cdfc17bf74b0a5be93d674de (diff) | |
Move QAudioDecoder to public.
To get better feedback between alpha & beta.
Change-Id: I3620825fb9c2bb9de69951cf1d583b191d62cb0d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/controls.pri | 6 | ||||
| -rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol.cpp (renamed from src/multimedia/controls/qaudiodecodercontrol_p.cpp) | 4 | ||||
| -rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol.h (renamed from src/multimedia/controls/qaudiodecodercontrol_p.h) | 2 |
3 files changed, 6 insertions, 6 deletions
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> |