summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorAngus Cummings <angus.cummings@nokia.com>2011-12-23 15:56:30 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-23 08:10:51 +0100
commitb094a91c9de269fa84b8dc1c0a353b4f6447fa04 (patch)
treef429fd14eec9862547f8f3e3d15d623bf9687643 /src/imports
parent973fb0680d6a8c50f128d8a094231372bcfe3552 (diff)
Added Video.qml to QtMultimedia, Video component
Change-Id: I0f5707a7cae931988aaddced23ad157105d0643b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/Video.qml104
-rw-r--r--src/imports/multimedia/multimedia.pro5
-rw-r--r--src/imports/multimedia/qmldir1
3 files changed, 109 insertions, 1 deletions
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
new file mode 100644
index 000000000..3c96bcd7e
--- /dev/null
+++ b/src/imports/multimedia/Video.qml
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtMultimedia 4.0
+
+Item {
+ id: video
+
+ /*** Properties of VideoOutput ***/
+ property alias fillMode: videoOut.fillMode
+ property alias orientation: videoOut.orientation
+
+ readonly property int stretch: VideoOutput.Stretch
+ readonly property int preserveAspectFit: VideoOutput.PreserveAspectFit
+ readonly property int preserveAspectCrop: VideoOutput.PreserveAspectCrop
+
+
+ /*** Properties of MediaPlayer ***/
+ property alias autoLoad: player.autoLoad
+ property alias bufferProgress: player.bufferProgress
+ property alias duration: player.duration
+ property alias error: player.error
+ property alias errorString: player.errorString
+ property alias metaData: player.metaData
+ property alias muted: player.muted
+ property alias paused: player.paused
+ property alias playbackRate: player.playbackRate
+ property alias playing: player.playing
+ property alias position: player.position
+ property alias seekable: player.seekable
+ property alias source: player.source
+ property alias status: player.status
+ property alias volume: player.volume
+
+ signal resumed
+ signal started
+ signal stopped
+
+
+ VideoOutput {
+ id: videoOut
+ anchors.fill: video
+ source: player
+ }
+
+ MediaPlayer {
+ id: player
+ onResumed: video.resumed()
+ onStarted: video.started()
+ onStopped: video.stopped()
+ }
+
+ function play() {
+ player.play();
+ }
+
+ function pause() {
+ player.pause();
+ }
+
+ function stop() {
+ player.stop();
+ }
+
+}
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 33269e326..831bc9408 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -58,7 +58,10 @@ disabled {
}
-qmldir.files += $$PWD/qmldir
+OTHER_FILES += \
+ Video.qml
+
+qmldir.files += $$PWD/qmldir $$PWD/Video.qml
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
# another copy of the qmldir file so the old import works
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index 91caabad1..8eff6b7ff 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -1 +1,2 @@
plugin declarative_multimedia
+Video 4.0 Video.qml