From d9f0af7e2ceb416fd44a0ca14d20df8604754dd1 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Sun, 28 Jul 2013 01:04:34 +0300 Subject: [PATCH] Fixed VideoPlayerPage.qml failure to set cameraConfig --- qml/PostCaptureItem.qml | 1 + qml/PostCaptureView.qml | 1 + qml/VideoPlayerPage.qml | 2 +- qml/main.qml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qml/PostCaptureItem.qml b/qml/PostCaptureItem.qml index 824f851..4cc51d1 100644 --- a/qml/PostCaptureItem.qml +++ b/qml/PostCaptureItem.qml @@ -25,6 +25,7 @@ import CameraPlus 1.0 Item { id: postCaptureItem + property bool isVideo: itemData.type.search("nmm#Video") > 0 property alias error: image.error property variant itemData: item diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml index 75f4371..d979a49 100644 --- a/qml/PostCaptureView.qml +++ b/qml/PostCaptureView.qml @@ -25,6 +25,7 @@ import CameraPlus 1.0 import QtCamera 1.0 Item { + property Camera camera: null property bool pressed: view.currentItem ? view.currentItem.playing : false property int policyMode: view.currentItem && view.currentItem.playing ? CameraResources.Player : settings.mode == Camera.VideoMode ? CameraResources.Video : diff --git a/qml/VideoPlayerPage.qml b/qml/VideoPlayerPage.qml index 535510e..9b6ec4f 100644 --- a/qml/VideoPlayerPage.qml +++ b/qml/VideoPlayerPage.qml @@ -58,7 +58,7 @@ Item { VideoPlayer { id: video anchors.fill: parent - cameraConfig: cam.cameraConfig + cameraConfig: camera.cameraConfig onError: showError(qsTr("Error playing video. Please try again or restart the application")) diff --git a/qml/main.qml b/qml/main.qml index a01489b..748ff83 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -46,6 +46,7 @@ CameraWindow { } PostCaptureView { + camera: viewfinder.camera width: mainView.width height: mainView.height } -- 2.34.1