API changes to QML element MediaPlayer aka Audio
Changed Video.qml for new API Removed lowercase enum copies, replaced with calling parent (VideoOutput, MediaPlayer) enums Removed properties playing, paused Removed signals started, resumed Added readonly property playbackState Added signal playing Added autoPlay property Fixed unit tests for new API Added backwards compatibility for QtMultimedia 4 Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Angus Cummings
committed by
Qt by Nokia
Qt by Nokia
parent
66b86ba581
commit
a94c8a1ac2
190
src/imports/multimedia/qdeclarativeaudio_p_4.h
Normal file
190
src/imports/multimedia/qdeclarativeaudio_p_4.h
Normal file
@@ -0,0 +1,190 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QDECLARATIVEAUDIO_4_P_H
|
||||
#define QDECLARATIVEAUDIO_4_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists for the convenience
|
||||
// of other Qt classes. This header file may change from version to
|
||||
// version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <QtCore/qbasictimer.h>
|
||||
#include <QtDeclarative/qdeclarativeparserstatus.h>
|
||||
#include <QtDeclarative/qdeclarative.h>
|
||||
|
||||
#include "qdeclarativemediabase_p_4.h"
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QTimerEvent;
|
||||
|
||||
class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QDeclarativeParserStatus
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
|
||||
Q_PROPERTY(bool autoLoad READ isAutoLoad WRITE setAutoLoad NOTIFY autoLoadChanged)
|
||||
Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
|
||||
Q_PROPERTY(int loops READ loopCount WRITE setLoopCount NOTIFY loopCountChanged)
|
||||
Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
|
||||
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
|
||||
Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
|
||||
Q_PROPERTY(int position READ position WRITE setPosition NOTIFY positionChanged)
|
||||
Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
|
||||
Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
|
||||
Q_PROPERTY(bool hasAudio READ hasAudio NOTIFY hasAudioChanged)
|
||||
Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged)
|
||||
Q_PROPERTY(int bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
|
||||
Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
|
||||
Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
|
||||
Q_PROPERTY(Error error READ error NOTIFY errorChanged)
|
||||
Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
|
||||
Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT)
|
||||
Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false)
|
||||
Q_ENUMS(Status)
|
||||
Q_ENUMS(Error)
|
||||
Q_ENUMS(Loop)
|
||||
Q_INTERFACES(QDeclarativeParserStatus)
|
||||
public:
|
||||
enum Status
|
||||
{
|
||||
UnknownStatus = QMediaPlayer::UnknownMediaStatus,
|
||||
NoMedia = QMediaPlayer::NoMedia,
|
||||
Loading = QMediaPlayer::LoadingMedia,
|
||||
Loaded = QMediaPlayer::LoadedMedia,
|
||||
Stalled = QMediaPlayer::StalledMedia,
|
||||
Buffering = QMediaPlayer::BufferingMedia,
|
||||
Buffered = QMediaPlayer::BufferedMedia,
|
||||
EndOfMedia = QMediaPlayer::EndOfMedia,
|
||||
InvalidMedia = QMediaPlayer::InvalidMedia
|
||||
};
|
||||
|
||||
enum Error
|
||||
{
|
||||
NoError = QMediaPlayer::NoError,
|
||||
ResourceError = QMediaPlayer::ResourceError,
|
||||
FormatError = QMediaPlayer::FormatError,
|
||||
NetworkError = QMediaPlayer::NetworkError,
|
||||
AccessDenied = QMediaPlayer::AccessDeniedError,
|
||||
ServiceMissing = QMediaPlayer::ServiceMissingError
|
||||
};
|
||||
|
||||
enum Loop
|
||||
{
|
||||
Infinite = QDeclarativeMediaBase_4::INFINITE
|
||||
};
|
||||
|
||||
QDeclarativeAudio_4(QObject *parent = 0);
|
||||
~QDeclarativeAudio_4();
|
||||
|
||||
bool hasAudio() const;
|
||||
bool hasVideo() const;
|
||||
|
||||
Status status() const;
|
||||
Error error() const;
|
||||
|
||||
void classBegin();
|
||||
void componentComplete();
|
||||
|
||||
QObject *mediaObject() { return m_mediaObject; }
|
||||
|
||||
public Q_SLOTS:
|
||||
void play();
|
||||
void pause();
|
||||
void stop();
|
||||
|
||||
Q_SIGNALS:
|
||||
void sourceChanged();
|
||||
void autoLoadChanged();
|
||||
void playingChanged();
|
||||
void pausedChanged();
|
||||
void loopCountChanged();
|
||||
|
||||
void started();
|
||||
void resumed();
|
||||
void paused();
|
||||
void stopped();
|
||||
|
||||
void statusChanged();
|
||||
|
||||
void durationChanged();
|
||||
void positionChanged();
|
||||
|
||||
void volumeChanged();
|
||||
void mutedChanged();
|
||||
void hasAudioChanged();
|
||||
void hasVideoChanged();
|
||||
|
||||
void bufferProgressChanged();
|
||||
|
||||
void seekableChanged();
|
||||
void playbackRateChanged();
|
||||
|
||||
void errorChanged();
|
||||
void error(QDeclarativeAudio_4::Error error, const QString &errorString);
|
||||
|
||||
void mediaObjectChanged();
|
||||
|
||||
private Q_SLOTS:
|
||||
void _q_error(int, const QString &);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QDeclarativeAudio_4)
|
||||
Q_PRIVATE_SLOT(mediaBase(), void _q_statusChanged())
|
||||
|
||||
inline QDeclarativeMediaBase_4 *mediaBase() { return this; }
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAudio_4))
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user