use the export list to get the decoder working

[zxing.git] / iphone / Classes / ZXingAppDelegate.m

diff --git a/iphone/Classes/ZXingAppDelegate.m b/iphone/Classes/ZXingAppDelegate.m
index 1b06e08..df3cb5f 100644 (file)
--- a/iphone/Classes/ZXingAppDelegate.m
+++ b/iphone/Classes/ZXingAppDelegate.m
@@ -47,22 +47,18 @@
   // show the window
   [window makeKeyAndVisible];
   
-  if ([[NSUserDefaults standardUserDefaults] boolForKey:@"autoChoosePicture"]) {    
-    // pick and decode using the first available source type in priority order
-#define N_SOURCE_TYPES 3
-    UIImagePickerControllerSourceType sourceTypes[N_SOURCE_TYPES] = {
-      UIImagePickerControllerSourceTypeCamera,
-      UIImagePickerControllerSourceTypeSavedPhotosAlbum,
-      UIImagePickerControllerSourceTypePhotoLibrary
-    };
+  // pick and decode using the first available source type in priority order
+  UIImagePickerControllerSourceType sourceTypes[] = {
+    UIImagePickerControllerSourceTypeCamera,
+    UIImagePickerControllerSourceTypeSavedPhotosAlbum,
+    UIImagePickerControllerSourceTypePhotoLibrary
+  };
 
-    for (int i = 0; i < N_SOURCE_TYPES; i++) {
-      if ([UIImagePickerController isSourceTypeAvailable:sourceTypes[i]]) {
-        [viewController pickAndDecodeFromSource:sourceTypes[i]];
-        break;
-      }
+  for (int i = 0; i < sizeof(sourceTypes) / sizeof(*sourceTypes); i++) {
+    if ([UIImagePickerController isSourceTypeAvailable:sourceTypes[i]]) {
+      [viewController pickAndDecodeFromSource:sourceTypes[i]];
+      break;
     }
-#undef N_SOURCE_TYPES
   }
 }