[-]
[+]
|
Changed |
_service:tar_git:harbour-advanced-camera-0.9.7.tar.bz2/qml/pages/CameraUI.qml
^
|
@@ -676,6 +676,7 @@
}
Component.onCompleted: {
+ settings.global.cameraCount = QtMultimedia.availableCameras.length
settings.calculateEnabledCameras()
camera.deviceId = settings.global.cameraId
_completed = true
@@ -841,8 +842,6 @@
camera.imageCapture.setResolution(settings.resolution("image"))
camera.videoRecorder.resolution = settings.resolution("video")
-
- settings.global.cameraCount = QtMultimedia.availableCameras.length
}
function setFocusMode(focus) {
@@ -887,6 +886,7 @@
/// * viewFinderResolution as set in jolla-camera's dconf settings
/// * Best match from camera.supportedViewfinderResolutions() that fit to screen and have the same aspect ratio
/// * device resolution
+
var currentRatioSize = modelResolution.sizeToRatio(
settings.resolution(settings.global.captureMode))
var currentRatio = currentRatioSize.height
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-advanced-camera-0.9.7.tar.bz2/qml/pages/Settings.qml
^
|
@@ -13,7 +13,7 @@
ConfigurationGroup {
id: globalSettings
path: "/uk/co/piggz/harbour-advanced-camera"
- property int cameraCount: QtMultimedia.availableCameras.length
+ property int cameraCount: 0 //default to 0 and get populated on startup
property string cameraId: "0"
property string captureMode: "image"
property bool swapZoomControl: false
@@ -74,7 +74,7 @@
function calculateEnabledCameras()
{
settings.enabledCameras = []
- for (var i = 0; i < QtMultimedia.availableCameras.length; ++i) {
+ for (var i = 0; i < globalSettings.cameraCount; ++i) {
if (settings.global.disabledCameras.indexOf("[" + QtMultimedia.availableCameras[i].deviceId + "]") == -1) {
settings.enabledCameras.push(QtMultimedia.availableCameras[i].deviceId)
}
|