Changeset 16355 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Feb 7, 2008, 1:45:56 PM (18 years ago)

Author:

Paul Price

Message:

Adding functions pmFPAfileSelect and pmFPAfileSelectSingle to return ('select') particular files from the list. Re-implementing pmFPAfileActivate using these.

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -912 +912 @@
 }
 
-// set the state of the specified pmFPAfile to active (state == true) or inactive
+
+// set the state of the specified pmFPAfile(s) to active (state == true) or inactive
 // if name is NULL, set the state for all pmFPAfiles
-bool pmFPAfileActivate (psMetadata *files, bool state, const char *name)
+bool pmFPAfileActivate(psMetadata *files, bool state, const char *name)
 {
     PS_ASSERT_PTR_NON_NULL(files, false);
 
-    // Do this as an iteration rather than a lookup, since we may want to turn on/off multiple files at once
-    // (if there are multiple files defined with the same name).
-
-    if (!name) {
-        psMetadataItem *item = NULL;
-        psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL);
-        while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
-            pmFPAfile *file = item->data.V;
-            if (state) {
-                file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE);
-            } else {
-                file->state |= PM_FPA_STATE_INACTIVE;
-            }
-        }
-        psFree (iter);
-        return true;
-    }
-
-    if (!psMetadataLookup(files, name)) {
-        // We activated every example of that file that we could find.
-        return true;
-    }
-
-    psString regex = NULL;              // Regular expression for psMetadataIteratorAlloc
-    if (name) {
-        psStringAppend(&regex, "^%s$", name);
-    }
-
-    int num = 0;                        // Number of files activated
-    psMetadataItem *item = NULL;        // Item from iteration
-    psMetadataIterator *iter = psMetadataIteratorAlloc(files, PS_LIST_HEAD, regex); // Iterator
-    while ((item = psMetadataGetAndIncrement(iter))) {
-        pmFPAfile *file = item->data.V; // File of interest
+    psArray *selected = pmFPAfileSelect(files, name);
+    if (!selected) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to select files with name %s", name);
+        return false;
+    }
+    for (int i = 0; i < selected->n; i++) {
+        pmFPAfile *file = selected->data[i]; // File of interest
+        if (!file) {
+            continue;
+        }
         if (state) {
             file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE);
@@ -956 +934 @@
             file->state |= PM_FPA_STATE_INACTIVE;
         }
-        num++;
-    }
-    psFree(iter);
-    psFree(regex);
+    }
+    psFree(selected);
 
     return true;
@@ -971 +947 @@
     PS_ASSERT_INT_NONNEGATIVE(num, NULL);
 
-    psString regex = NULL;              // Regular expression for psMetadataIteratorAlloc
-    psStringAppend(&regex, "^%s$", name);
-
-    int i = 0;                          // Counter
-    psMetadataItem *item = NULL;        // Item from iteration
-    psMetadataIterator *iter = psMetadataIteratorAlloc(files, PS_LIST_HEAD, regex); // Iterator
-    psFree(regex);
-    while ((item = psMetadataGetAndIncrement(iter))) {
-        if (i++ == num) {
-            pmFPAfile *file = item->data.V; // File of interest
-            if (state) {
-                file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE);
-            } else {
-                file->state |= PM_FPA_STATE_INACTIVE;
-            }
-            psFree(iter);
-            return file;
-        }
-    }
-    psFree(iter);
-    return NULL;
-}
+    pmFPAfile *file = pmFPAfileSelectSingle(files, name, num);
+    if (!file) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to select instance %d of file %s", num, name);
+        return NULL;
+    }
+    if (state) {
+        file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE);
+    } else {
+        file->state |= PM_FPA_STATE_INACTIVE;
+    }
+
+    return file;
+}