| @@ -1,7 +1,7 @@
[apps/jolla-camera/primary/image]
imageResolution='@PRIIMAGE43RES@'
videoResolution='@PRIVIDEORES@'
-viewfinderResolution='@VF43RES@'
+viewfinderResolution='@PRIVF43RES@'
isoValues=[0, 100, 200, 400]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[8, 4, 16]
@@ -9,16 +9,14 @@
exposureCompensationValues=[4, 2, 0, -2, -4]
imageResolution_4_3='@PRIIMAGE43RES@'
imageResolution_16_9='@PRIIMAGE169RES@'
-viewfinderResolution_4_3='@VF43RES@'
-viewfinderResolution_16_9='@VF169RES@'
-resolutionText_4_3='camera_settings-me-4-3-8m'
-resolutionText_16_9='camera_settings-me-16-9-6m'
+viewfinderResolution_4_3='@PRIVF43RES@'
+viewfinderResolution_16_9='@PRIVF169RES@'
focusDistance=16
[apps/jolla-camera/secondary/image]
imageResolution='@SECIMAGE43RES@'
videoResolution='@SECVIDEORES@'
-viewfinderResolution='@VF43RES@'
+viewfinderResolution='@SECVF43RES@'
isoValues=[0, 100, 200, 400]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4]
@@ -26,16 +24,14 @@
exposureCompensationValues=[4, 2, 0, -2, -4]
imageResolution_4_3='@SECIMAGE43RES@'
imageResolution_16_9='@SECIMAGE169RES@'
-viewfinderResolution_4_3='@VF43RES@'
-viewfinderResolution_16_9='@VF169RES@'
-resolutionText_4_3='camera_settings-me-4-3-2m'
-resolutionText_16_9='camera_settings-me-16-9-1m'
+viewfinderResolution_4_3='@SECVF43RES@'
+viewfinderResolution_16_9='@SECVF169RES@'
focusDistance=4
[apps/jolla-camera/primary/video]
imageResolution='@PRIVIDEORES@'
videoResolution='@PRIVIDEORES@'
-viewfinderResolution='@VF169RES@'
+viewfinderResolution='@PRIVF169RES@'
isoValues=[0, 100, 200, 400]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4, 16]
@@ -46,7 +42,7 @@
[apps/jolla-camera/secondary/video]
imageResolution='@SECVIDEORES@'
videoResolution='@SECVIDEORES@'
-viewfinderResolution='@VF169RES@'
+viewfinderResolution='@SECVF169RES@'
isoValues=[0, 100, 200, 400]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4]
|
| @@ -162,6 +162,7 @@
continue;
}
+ QString camKey = cameras.at(i).first.left(3).toUpper();
for (j=0 ; j<resolutions.at(i).size() ; j++)
{
QStringList res = resolutions.at(i).at(j).second;
@@ -175,40 +176,38 @@
qMax(screenGeometry.height(), screenGeometry.width()) >=
qMax(res.at(m).split("x").at(0).toInt(), res.at(m).split("x").at(1).toInt()))
{
- if (Camres::aspectRatioForResolution(res.at(m)).compare("4:3") == 0 && map.value("@VF43RES@").isEmpty())
+ if (Camres::aspectRatioForResolution(res.at(m)).compare("4:3") == 0 && map.value("@" + camKey + "VF43RES@").isEmpty())
{
- map.insert("@VF43RES@", res.at(m));
+ map.insert("@" + camKey + "VF43RES@", res.at(m));
}
- else if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@VF169RES@").isEmpty())
+ else if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@" + camKey + "VF169RES@").isEmpty())
{
- map.insert("@VF169RES@", res.at(m));
+ map.insert("@" + camKey + "VF169RES@", res.at(m));
}
}
}
}
else if (resolutions.at(i).at(j).first.startsWith("image"))
{
- QString cam = cameras.at(i).first.left(3).toUpper();
for (m=0 ; m<res.size() ; m++)
{
- if (Camres::aspectRatioForResolution(res.at(m)).compare("4:3") == 0 && map.value("@" + cam + "IMAGE43RES@").isEmpty())
+ if (Camres::aspectRatioForResolution(res.at(m)).compare("4:3") == 0 && map.value("@" + camKey + "IMAGE43RES@").isEmpty())
{
- map.insert("@" + cam + "IMAGE43RES@", res.at(m));
+ map.insert("@" + camKey + "IMAGE43RES@", res.at(m));
}
- else if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@" + cam + "IMAGE169RES@").isEmpty())
+ else if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@" + camKey + "IMAGE169RES@").isEmpty())
{
- map.insert("@" + cam + "IMAGE169RES@", res.at(m));
+ map.insert("@" + camKey + "IMAGE169RES@", res.at(m));
}
}
}
else if (resolutions.at(i).at(j).first.startsWith("video"))
{
- QString cam = cameras.at(i).first.left(3).toUpper();
for (m=0 ; m<res.size() ; m++)
{
- if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@" + cam + "VIDEORES@").isEmpty())
+ if (Camres::aspectRatioForResolution(res.at(m)).compare("16:9") == 0 && map.value("@" + camKey + "VIDEORES@").isEmpty())
{
- map.insert("@" + cam + "VIDEORES@", res.at(m));
+ map.insert("@" + camKey + "VIDEORES@", res.at(m));
}
}
}
|
