summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-06-09 18:30:32 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-11 05:16:23 +0000
commit7f9beeaf9c1f86268dee8e6f668fbf78313ffd9c (patch)
tree6b35adfa5f694ceddd6e32a357f4e6b0ffa80666 /src/plugins
parentf93f4e3daab1f9cbebbf663f1119a080cb299b9f (diff)
Define QCamera::FrameRateRange as a struct.
Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 87af9a6e3..a2586aa9d 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -789,7 +789,7 @@ void DSCameraSession::disconnectGraph()
static bool qt_frameRateRangeGreaterThan(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2)
{
- return r1.second > r2.second;
+ return r1.maximumFrameRate > r2.maximumFrameRate;
}
void DSCameraSession::updateSourceCapabilities()
@@ -896,8 +896,8 @@ void DSCameraSession::updateSourceCapabilities()
Q_FOREACH (const QCamera::FrameRateRange &frameRateRange, frameRateRanges) {
QCameraViewfinderSettings settings;
settings.setResolution(resolution);
- settings.setMinimumFrameRate(frameRateRange.first);
- settings.setMaximumFrameRate(frameRateRange.second);
+ settings.setMinimumFrameRate(frameRateRange.minimumFrameRate);
+ settings.setMaximumFrameRate(frameRateRange.maximumFrameRate);
settings.setPixelFormat(pixelFormat);
m_supportedViewfinderSettings.append(settings);