Make ScaleButtonType optional.
authorMohammed Sameer <msameer@foolab.org>
Tue, 1 Jan 2013 13:22:39 +0000 (15:22 +0200)
committerMohammed Sameer <msameer@foolab.org>
Tue, 1 Jan 2013 13:22:39 +0000 (15:22 +0200)
We can still zoom without it

src/cameraresources.cpp

index 8644509..b81c736 100644 (file)
@@ -187,23 +187,25 @@ void CameraResourcesWorker::acquire(bool *ok, const CameraResources::Mode& mode)
   case CameraResources::Image:
     *ok = updateSet(QList<ResourcePolicy::ResourceType>()
                    << ResourcePolicy::VideoPlaybackType
-                   << ResourcePolicy::VideoRecorderType
+                   << ResourcePolicy::VideoRecorderType,
+                   QList<ResourcePolicy::ResourceType>()
                    << ResourcePolicy::ScaleButtonType);
     break;
 
   case CameraResources::Video:
     *ok = updateSet(QList<ResourcePolicy::ResourceType>()
                    << ResourcePolicy::VideoPlaybackType
-                   << ResourcePolicy::VideoRecorderType
+                   << ResourcePolicy::VideoRecorderType,
+                   QList<ResourcePolicy::ResourceType>()
                    << ResourcePolicy::ScaleButtonType);
     break;
 
   case CameraResources::Recording:
     *ok = updateSet(QList<ResourcePolicy::ResourceType>()
                    << ResourcePolicy::VideoPlaybackType
-                   << ResourcePolicy::VideoRecorderType
-                   << ResourcePolicy::ScaleButtonType,
+                   << ResourcePolicy::VideoRecorderType,
                    QList<ResourcePolicy::ResourceType>()
+                   << ResourcePolicy::ScaleButtonType
                    << ResourcePolicy::AudioRecorderType
                    << ResourcePolicy::AudioPlaybackType);
     break;