diff options
author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-12-05 15:38:14 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 14:26:03 +0100 |
commit | 60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929 (patch) | |
tree | 9b715c70d25f1b46b3a4caf46e58cb1caa0ad34f /src/imports/multimedia/qdeclarativevideooutput_p.h | |
parent | a52f552d4274eeaeb3a7362c509e77df501b1349 (diff) |
Allow plugins to override the QML VideoOutput type.
Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools
library to make the QDeclarativeVideoOutputBackend interface
implementable by a plugin.
Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativevideooutput_p.h')
-rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput_p.h | 155 |
1 files changed, 0 insertions, 155 deletions
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h deleted file mode 100644 index 07fdb41e3..000000000 --- a/src/imports/multimedia/qdeclarativevideooutput_p.h +++ /dev/null @@ -1,155 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Copyright (C) 2012 Research In Motion -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDECLARATIVEVIDEOOUTPUT_P_H -#define QDECLARATIVEVIDEOOUTPUT_P_H - -#include <QtCore/qrect.h> -#include <QtCore/qsharedpointer.h> -#include <QtQuick/qquickitem.h> -#include <QtCore/qpointer.h> - -QT_BEGIN_NAMESPACE - -class QMediaObject; -class QMediaService; -class QDeclarativeVideoBackend; -class QVideoOutputOrientationHandler; - -class QDeclarativeVideoOutput : public QQuickItem -{ - Q_OBJECT - Q_DISABLE_COPY(QDeclarativeVideoOutput) - Q_PROPERTY(QObject* source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged) - Q_PROPERTY(int orientation READ orientation WRITE setOrientation NOTIFY orientationChanged) - Q_PROPERTY(bool autoOrientation READ autoOrientation WRITE setAutoOrientation NOTIFY autoOrientationChanged REVISION 2) - Q_PROPERTY(QRectF sourceRect READ sourceRect NOTIFY sourceRectChanged) - Q_PROPERTY(QRectF contentRect READ contentRect NOTIFY contentRectChanged) - Q_ENUMS(FillMode) - -public: - enum FillMode - { - Stretch = Qt::IgnoreAspectRatio, - PreserveAspectFit = Qt::KeepAspectRatio, - PreserveAspectCrop = Qt::KeepAspectRatioByExpanding - }; - - QDeclarativeVideoOutput(QQuickItem *parent = 0); - ~QDeclarativeVideoOutput(); - - QObject *source() const { return m_source.data(); } - void setSource(QObject *source); - - FillMode fillMode() const; - void setFillMode(FillMode mode); - - int orientation() const; - void setOrientation(int); - - bool autoOrientation() const; - void setAutoOrientation(bool); - - QRectF sourceRect() const; - QRectF contentRect() const; - - Q_INVOKABLE QPointF mapPointToItem(const QPointF &point) const; - Q_INVOKABLE QRectF mapRectToItem(const QRectF &rectangle) const; - Q_INVOKABLE QPointF mapNormalizedPointToItem(const QPointF &point) const; - Q_INVOKABLE QRectF mapNormalizedRectToItem(const QRectF &rectangle) const; - Q_INVOKABLE QPointF mapPointToSource(const QPointF &point) const; - Q_INVOKABLE QRectF mapRectToSource(const QRectF &rectangle) const; - Q_INVOKABLE QPointF mapPointToSourceNormalized(const QPointF &point) const; - Q_INVOKABLE QRectF mapRectToSourceNormalized(const QRectF &rectangle) const; - - enum SourceType { - NoSource, - MediaObjectSource, - VideoSurfaceSource - }; - SourceType sourceType() const; - -Q_SIGNALS: - void sourceChanged(); - void fillModeChanged(QDeclarativeVideoOutput::FillMode); - void orientationChanged(); - void autoOrientationChanged(); - void sourceRectChanged(); - void contentRectChanged(); - -protected: - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); - void itemChange(ItemChange change, const ItemChangeData &changeData); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - -private Q_SLOTS: - void _q_updateMediaObject(); - void _q_updateNativeSize(); - void _q_updateGeometry(); - void _q_screenOrientationChanged(int); - -private: - bool createBackend(QMediaService *service); - - SourceType m_sourceType; - - QPointer<QObject> m_source; - QPointer<QMediaObject> m_mediaObject; - QPointer<QMediaService> m_service; - - FillMode m_fillMode; - QSize m_nativeSize; - - bool m_geometryDirty; - QRectF m_lastRect; // Cache of last rect to avoid recalculating geometry - QRectF m_contentRect; // Destination pixel coordinates, unclipped - int m_orientation; - bool m_autoOrientation; - QVideoOutputOrientationHandler *m_screenOrientationHandler; - - QScopedPointer<QDeclarativeVideoBackend> m_backend; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVEVIDEOOUTPUT_H |