Changes to night mode handling:

[harmattan/cameraplus] / lib / qtcamimagesettings.cpp

diff --git a/lib/qtcamimagesettings.cpp b/lib/qtcamimagesettings.cpp
index ed0c500..36db068 100644 (file)
--- a/lib/qtcamimagesettings.cpp
+++ b/lib/qtcamimagesettings.cpp
@@ -7,17 +7,14 @@ public:
   QSize capture;
   QSize preview;
   QSize viewfinder;
-  int numerator;
-  int denominator;
-  int nightNumerator;
-  int nightDenominator;
+  int fps;
+  int nightFps;
 };
 
 QtCamImageSettings::QtCamImageSettings(const QString& id, const QString& name,
                                       const QSize& capture, const QSize& preview,
                                       const QSize& viewfinder,
-                                      int numerator, int denominator,
-                                      int nightNumerator, int nightDenominator) :
+                                      int fps, int nightFps) :
   d_ptr(new QtCamImageSettingsPrivate) {
 
   d_ptr->id = id;
@@ -25,10 +22,8 @@ QtCamImageSettings::QtCamImageSettings(const QString& id, const QString& name,
   d_ptr->capture = capture;
   d_ptr->preview = preview;
   d_ptr->viewfinder = viewfinder;
-  d_ptr->numerator = numerator;
-  d_ptr->denominator = denominator;
-  d_ptr->nightNumerator = nightNumerator;
-  d_ptr->nightDenominator = nightDenominator;
+  d_ptr->fps = fps;
+  d_ptr->nightFps = nightFps;
 }
 
 QtCamImageSettings::QtCamImageSettings(const QtCamImageSettings& other) :
@@ -39,10 +34,8 @@ QtCamImageSettings::QtCamImageSettings(const QtCamImageSettings& other) :
   d_ptr->capture = other.d_ptr->capture;
   d_ptr->preview = other.d_ptr->preview;
   d_ptr->viewfinder = other.d_ptr->viewfinder;
-  d_ptr->numerator = other.d_ptr->numerator;
-  d_ptr->denominator = other.d_ptr->denominator;
-  d_ptr->nightNumerator = other.d_ptr->nightNumerator;
-  d_ptr->nightDenominator = other.d_ptr->nightDenominator;
+  d_ptr->fps = other.d_ptr->fps;
+  d_ptr->nightFps = other.d_ptr->nightFps;
 }
 
 QtCamImageSettings::~QtCamImageSettings() {
@@ -56,10 +49,8 @@ QtCamImageSettings& QtCamImageSettings::operator=(const QtCamImageSettings&
   d_ptr->capture = other.d_ptr->capture;
   d_ptr->preview = other.d_ptr->preview;
   d_ptr->viewfinder = other.d_ptr->viewfinder;
-  d_ptr->numerator = other.d_ptr->numerator;
-  d_ptr->denominator = other.d_ptr->denominator;
-  d_ptr->nightNumerator = other.d_ptr->nightNumerator;
-  d_ptr->nightDenominator = other.d_ptr->nightDenominator;
+  d_ptr->fps = other.d_ptr->fps;
+  d_ptr->nightFps = other.d_ptr->nightFps;
 
   return *this;
 }
@@ -84,10 +75,10 @@ QSize QtCamImageSettings::previewResolution() const {
   return d_ptr->preview;
 }
 
-QPair<int, int> QtCamImageSettings::frameRate() const {
-  return qMakePair<int, int>(d_ptr->numerator, d_ptr->denominator);
+int QtCamImageSettings::frameRate() const {
+  return d_ptr->fps;
 }
 
-QPair<int, int> QtCamImageSettings::nightFrameRate() const {
-  return qMakePair<int, int>(d_ptr->nightNumerator, d_ptr->nightDenominator);
+int QtCamImageSettings::nightFrameRate() const {
+  return d_ptr->nightFps;
 }