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/audio | |
| parent | 8484b0ff9c40fe70cdfc17bf74b0a5be93d674de (diff) | |
| download | qtmultimedia-e057fd9e8a68aa7ab5cbe3cfd8d6f9f787107dcd.tar.gz | |
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/audio')
| -rw-r--r-- | src/multimedia/audio/audio.pri | 6 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodecoder.cpp (renamed from src/multimedia/audio/qaudiodecoder_p.cpp) | 6 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodecoder.h (renamed from src/multimedia/audio/qaudiodecoder_p.h) | 0 |
3 files changed, 6 insertions, 6 deletions
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 |