setIntValue does not set the value if it's equal to the old one. Added a force flag...

diff --git a/lib/qtcamcapability_p.h b/lib/qtcamcapability_p.h
index b060ef3..54d9829 100644 (file)
--- a/lib/qtcamcapability_p.h
+++ b/lib/qtcamcapability_p.h
@@ -57,12 +57,22 @@ public:
     return true;
   }
 
-  bool setIntValue(int val) {
+  bool setIntValue(int val, bool force) {
     if (!src) {
       return false;
     }
 
-    g_object_set(src, prop.toAscii().data(), val, NULL);
+    if (force) {
+      g_object_set(src, prop.toAscii().data(), val, NULL);
+      return true;
+    }
+
+    int old = 0;
+    g_object_get(src, prop.toAscii().data(), &old, NULL);
+
+    if (old != val) {
+      g_object_set(src, prop.toAscii().data(), val, NULL);
+    }
 
     return true;
   }

diff --git a/lib/qtcamcolortone.cpp b/lib/qtcamcolortone.cpp
index a396845..14487f1 100644 (file)
--- a/lib/qtcamcolortone.cpp
+++ b/lib/qtcamcolortone.cpp
@@ -37,5 +37,5 @@ QtCamColorTone::ColorToneMode QtCamColorTone::value() {
 }
 
 bool QtCamColorTone::setValue(const QtCamColorTone::ColorToneMode& mode) {
-  return d_ptr->setIntValue(mode);
+  return d_ptr->setIntValue(mode, false);
 }

diff --git a/lib/qtcamflash.cpp b/lib/qtcamflash.cpp
index c83ff54..97e76c3 100644 (file)
--- a/lib/qtcamflash.cpp
+++ b/lib/qtcamflash.cpp
@@ -29,5 +29,5 @@ QtCamFlash::FlashMode QtCamFlash::value() {
 }
 
 bool QtCamFlash::setValue(const QtCamFlash::FlashMode& mode) {
-  return d_ptr->setIntValue(mode);
+  return d_ptr->setIntValue(mode, false);
 }

diff --git a/lib/qtcamscene.cpp b/lib/qtcamscene.cpp
index 333697c..b0f6bf8 100644 (file)
--- a/lib/qtcamscene.cpp
+++ b/lib/qtcamscene.cpp
@@ -31,5 +31,6 @@ QtCamScene::SceneMode QtCamScene::value() {
 }
 
 bool QtCamScene::setValue(const QtCamScene::SceneMode& mode) {
-  return d_ptr->setIntValue(mode);
+  // Scene mode is always forced in order to reset the other capabilities.
+  return d_ptr->setIntValue(mode, true);
 }

diff --git a/lib/qtcamwhitebalance.cpp b/lib/qtcamwhitebalance.cpp
index 665d91c..f39fe3c 100644 (file)
--- a/lib/qtcamwhitebalance.cpp
+++ b/lib/qtcamwhitebalance.cpp
@@ -32,5 +32,5 @@ QtCamWhiteBalance::WhiteBalanceMode QtCamWhiteBalance::value() {
 }
 
 bool QtCamWhiteBalance::setValue(const QtCamWhiteBalance::WhiteBalanceMode& mode) {
-  return d_ptr->setIntValue(mode);
+  return d_ptr->setIntValue(mode, false);
 }