Make the C++ API of QSoundEffect public.
The QML API already was. The C++ API still needs good documentation, though. Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
21fbb1d025
commit
d414247afe
@@ -43,7 +43,7 @@
|
|||||||
#include <QtDeclarative/qdeclarative.h>
|
#include <QtDeclarative/qdeclarative.h>
|
||||||
#include <QtDeclarative/qdeclarativeengine.h>
|
#include <QtDeclarative/qdeclarativeengine.h>
|
||||||
#include <QtDeclarative/qdeclarativecomponent.h>
|
#include <QtDeclarative/qdeclarativecomponent.h>
|
||||||
#include "private/qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
#include "qdeclarativemediametadata_p.h"
|
#include "qdeclarativemediametadata_p.h"
|
||||||
#include "qdeclarativeaudio_p.h"
|
#include "qdeclarativeaudio_p.h"
|
||||||
|
|||||||
@@ -23,8 +23,10 @@ unix:!mac {
|
|||||||
SOURCES += effects/qsoundeffect_qmedia_p.cpp
|
SOURCES += effects/qsoundeffect_qmedia_p.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PUBLIC_HEADERS += \
|
||||||
|
effects/qsoundeffect.h
|
||||||
|
|
||||||
PRIVATE_HEADERS += \
|
PRIVATE_HEADERS += \
|
||||||
effects/qsoundeffect_p.h \
|
|
||||||
effects/qwavedecoder_p.h \
|
effects/qwavedecoder_p.h \
|
||||||
effects/qsamplecache_p.h
|
effects/qsamplecache_p.h
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
#if defined(QT_MULTIMEDIA_PULSEAUDIO)
|
#if defined(QT_MULTIMEDIA_PULSEAUDIO)
|
||||||
#include "qsoundeffect_pulse_p.h"
|
#include "qsoundeffect_pulse_p.h"
|
||||||
@@ -159,7 +159,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\internal
|
|
||||||
\since 1.0
|
\since 1.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -298,4 +297,4 @@ void QSoundEffect::stop()
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#include "moc_qsoundeffect_p.cpp"
|
#include "moc_qsoundeffect.cpp"
|
||||||
|
|||||||
@@ -39,19 +39,8 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef QSOUNDEFFECT_P_H
|
#ifndef QSOUNDEFFECT_H
|
||||||
#define QSOUNDEFFECT_P_H
|
#define QSOUNDEFFECT_H
|
||||||
|
|
||||||
//
|
|
||||||
// W A R N I N G
|
|
||||||
// -------------
|
|
||||||
//
|
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
|
||||||
// implementation detail. This header file may change from version to
|
|
||||||
// version without notice, or even be removed.
|
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <qtmultimediadefs.h>
|
#include <qtmultimediadefs.h>
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
#include "qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
#include <QtCore/qdatetime.h>
|
#include <QtCore/qdatetime.h>
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
#include "qmediaplayer.h"
|
#include "qmediaplayer.h"
|
||||||
#include "qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
|
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
#include "qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
#include <qaudiooutput.h>
|
#include <qaudiooutput.h>
|
||||||
#include <qaudiodeviceinfo.h>
|
#include <qaudiodeviceinfo.h>
|
||||||
#include <qaudio.h>
|
#include <qaudio.h>
|
||||||
#include "private/qsoundeffect_p.h"
|
#include "qsoundeffect.h"
|
||||||
|
|
||||||
|
|
||||||
class tst_QSoundEffect : public QObject
|
class tst_QSoundEffect : public QObject
|
||||||
|
|||||||
Reference in New Issue
Block a user