slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated declarative components to use the QML module

Browse Source 
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Jonas Rabbe
2012-03-14 08:39:43 +10:00
committed by Qt by Nokia
parent 8d63785425
commit 8e82f57c6a
31 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/imports/audioengine/audioengine.cpp
View File

@@ -39,10 +39,10 @@
**
****************************************************************************/
#include <QtDeclarative/qdeclarativeextensionplugin.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqmlextensionplugin.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include "qdeclarative_audioengine_p.h"
#include "qdeclarative_soundinstance_p.h"
@@ -55,7 +55,7 @@
QT_BEGIN_NAMESPACE
class QAudioEngineDeclarativeModule : public QDeclarativeExtensionPlugin
class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT
public:

2
src/imports/audioengine/audioengine.pro
View File

@@ -2,7 +2,7 @@ TARGET = declarative_audioengine
TARGETPATH = QtAudioEngine
include(../qimportbase.pri)
QT += declarative quick multimedia-private
QT += quick qml multimedia-private
win32 {
LIBS += -lOpenAL32

8
src/imports/audioengine/qdeclarative_attenuationmodel_p.h
View File

@@ -42,18 +42,18 @@
#ifndef QDECLARATIVEATTENUATIONMODEL_P_H
#define QDECLARATIVEATTENUATIONMODEL_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
#include <QVector3D>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDeclarativeAttenuationModel : public QObject, public QDeclarativeParserStatus
class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(QString name READ name WRITE setName)
public:

8
src/imports/audioengine/qdeclarative_audiocategory_p.h
View File

@@ -42,17 +42,17 @@
#ifndef QDECLARATIVEAUDIOCATEGORY_P_H
#define QDECLARATIVEAUDIOCATEGORY_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDeclarativeAudioCategory : public QObject, public QDeclarativeParserStatus
class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
Q_PROPERTY(QString name READ name WRITE setName)

2
src/imports/audioengine/qdeclarative_audioengine_p.cpp
View File

@@ -48,7 +48,7 @@
#include "qdeclarative_attenuationmodel_p.h"
#include "qdeclarative_soundinstance_p.h"
#include "qsoundinstance_p.h"
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtQml/qqmlengine.h>
#include "qdebug.h"
#define DEBUG_AUDIOENGINE

12
src/imports/audioengine/qdeclarative_audioengine_p.h
View File

@@ -42,9 +42,9 @@
#ifndef QDECLARATIVEAUDIOENGINE_P_H
#define QDECLARATIVEAUDIOENGINE_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtDeclarative/qdeclarativepropertymap.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlpropertymap.h>
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QTimer>
@@ -64,11 +64,11 @@ class QAudioCategory;
class QDeclarativeAttenuationModel;
class QSoundInstance;
class QDeclarativeAudioEngine : public QObject, public QDeclarativeParserStatus
class QDeclarativeAudioEngine : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_PROPERTY(QDeclarativeListProperty<QObject> bank READ bank CONSTANT)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(QQmlListProperty<QObject> bank READ bank CONSTANT)
Q_PROPERTY(QObject* categories READ categories CONSTANT)
Q_PROPERTY(QObject* samples READ samples CONSTANT)
Q_PROPERTY(QObject* sounds READ sounds CONSTANT)

8
src/imports/audioengine/qdeclarative_audiosample_p.h
View File

@@ -42,8 +42,8 @@
#ifndef QDECLARATIVEAUDIOSAMPLE_P_H
#define QDECLARATIVEAUDIOSAMPLE_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
QT_BEGIN_HEADER
@@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE
class QSoundBuffer;
class QDeclarativeAudioSample : public QObject, public QDeclarativeParserStatus
class QDeclarativeAudioSample : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QUrl source READ source WRITE setSource)
Q_PROPERTY(bool preloaded READ isPreloaded WRITE setPreloaded)

8
src/imports/audioengine/qdeclarative_playvariation_p.h
View File

@@ -42,8 +42,8 @@
#ifndef QDECLARATIVEPLAYVARIATION_P_H
#define QDECLARATIVEPLAYVARIATION_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
QT_BEGIN_HEADER
@@ -52,10 +52,10 @@ QT_BEGIN_NAMESPACE
class QDeclarativeAudioSample;
class QSoundInstance;
class QDeclarativePlayVariation : public QObject, public QDeclarativeParserStatus
class QDeclarativePlayVariation : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(QString sample READ sample WRITE setSample)
Q_PROPERTY(bool looping READ isLooping WRITE setLooping)
Q_PROPERTY(qreal maxGain READ maxGain WRITE setMaxGain)

4
src/imports/audioengine/qdeclarative_sound_p.h
View File

@@ -42,8 +42,8 @@
#ifndef QDECLARATIVESOUND_P_H
#define QDECLARATIVESOUND_P_H
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmlcomponent.h>
#include <QtCore/qlist.h>
#include "qdeclarative_playvariation_p.h"