Mercurial > hg > dmlib

changeset 399:525f7af644c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix timeline writing and loading.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 19 Oct 2012 10:04:57 +0300
parents 8660c6005032
children f44a89a25c97
files dmtimeline.c dmtimelinew.c
diffstat 2 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dmtimeline.c	Fri Oct 19 09:46:05 2012 +0300
+++ b/dmtimeline.c	Fri Oct 19 10:04:57 2012 +0300
@@ -4,7 +4,7 @@
 static BOOL dmLoadFloatValue(DMResource *res, DMFloat *val)
 {
     char tmp[DT_FLOAT_STORE_SIZE + 1];
-    if (dmf_read_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE) != DT_FLOAT_STORE_SIZE)
+    if (!dmf_read_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE))
         return FALSE;
 
     tmp[DT_FLOAT_STORE_SIZE] = 0;
@@ -89,7 +89,7 @@
     DMFTimelineEventParam hdr;
     Uint16 len;
 
-    if (dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) != sizeof(hdr.name) ||
+    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) ||
         !dmf_read_le32(res, &hdr.type))
         return DMERR_FREAD;
 
@@ -113,7 +113,7 @@
                 return DMERR_FREAD;
 
             param->vstr = dmMalloc((unsigned int)len + 1);
-            if (dmf_read_str(res, (Uint8 *) param->vstr, len) != len)
+            if (!dmf_read_str(res, (Uint8 *) param->vstr, len))
                 return DMERR_FREAD;
 
             param->vstr[len] = 0;
@@ -135,7 +135,7 @@
     // Get basic event data
     if (!dmf_read_le32(res, &hdr.start) ||
         !dmf_read_le32(res, &hdr.duration) ||
-        dmf_read_str(res, (Uint8 *) &hdr.effectName, sizeof(hdr.effectName)) != sizeof(hdr.effectName) ||
+        !dmf_read_str(res, (Uint8 *) &hdr.effectName, sizeof(hdr.effectName)) ||
         !dmf_read_le32(res, &hdr.nparams))
         return DMERR_FREAD;
 
@@ -196,7 +196,7 @@
     if ((*ptrack = track = dmMalloc0(sizeof(DMTimelineTrack))) == NULL)
         return DMERR_MALLOC;
 
-    if (dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) != sizeof(hdr.name))
+    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)))
         return DMERR_FREAD;
 
     hdr.enabled = dmfgetc(res);
@@ -236,13 +236,13 @@
         return DMERR_MALLOC;
 
     // Read and check header
-    if (dmf_read_str(res, (Uint8 *) &hdr.magic, sizeof(hdr.magic)) != sizeof(hdr.magic))
+    if (!dmf_read_str(res, (Uint8 *) &hdr.magic, sizeof(hdr.magic)))
         return DMERR_FREAD;
 
     if (memcmp(hdr.magic, DT_MAGIC_ID, sizeof(hdr.magic)) != 0)
         return DMERR_INVALID_DATA;
 
-    if (dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) != sizeof(hdr.name) ||
+    if (!dmf_read_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) ||
         !dmf_read_le32(res, &hdr.ntracks) ||
         !dmf_read_le32(res, &hdr.duration))
         return DMERR_FREAD;
--- a/dmtimelinew.c	Fri Oct 19 09:46:05 2012 +0300
+++ b/dmtimelinew.c	Fri Oct 19 10:04:57 2012 +0300
@@ -6,7 +6,7 @@
 {
     char tmp[DT_FLOAT_STORE_SIZE];
     snprintf(tmp, DT_FLOAT_STORE_SIZE, "%f", val);
-    return (dmf_write_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE) == DT_FLOAT_STORE_SIZE);
+    return !dmf_write_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE);
 }
 
 
@@ -89,7 +89,7 @@
     strncpy(hdr.name, param->name, sizeof(hdr.name));
     hdr.type = param->type;
 
-    if (dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) != sizeof(hdr.name) ||
+    if (!dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) ||
         !dmf_write_le32(res, hdr.type))
         return DMERR_FWRITE;
 
@@ -108,7 +108,7 @@
             if (!dmf_write_le16(res, len))
                 return DMERR_FWRITE;
 
-            if (dmf_write_str(res, (Uint8 *) param->vstr, len) != len)
+            if (!dmf_write_str(res, (Uint8 *) param->vstr, len))
                 return DMERR_FWRITE;
             break;
     }
@@ -129,7 +129,7 @@
 
     if (!dmf_write_le32(res, hdr.start) ||
         !dmf_write_le32(res, hdr.duration) ||
-        dmf_write_str(res, (Uint8 *) hdr.effectName, sizeof(hdr.effectName)) != sizeof(hdr.effectName) ||
+        !dmf_write_str(res, (Uint8 *) hdr.effectName, sizeof(hdr.effectName)) ||
         !dmf_write_le32(res, hdr.nparams))
         return DMERR_FWRITE;
 
@@ -152,7 +152,7 @@
     hdr.enabled = track->enabled;
     hdr.nevents = track->nevents;
 
-    if (dmf_write_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)) != sizeof(hdr.name))
+    if (!dmf_write_str(res, (Uint8 *) &hdr.name, sizeof(hdr.name)))
         return DMERR_FWRITE;
 
     dmfputc(hdr.enabled, res);
@@ -182,8 +182,8 @@
     hdr.ntracks = tl->ntracks;
     hdr.duration = tl->duration;
     
-    if (dmf_write_str(res, (Uint8 *) hdr.magic, sizeof(hdr.magic)) != sizeof(hdr.magic) ||
-        dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) != sizeof(hdr.name) ||
+    if (!dmf_write_str(res, (Uint8 *) hdr.magic, sizeof(hdr.magic)) ||
+        !dmf_write_str(res, (Uint8 *) hdr.name, sizeof(hdr.name)) ||
         !dmf_write_le32(res, hdr.ntracks) ||
         !dmf_write_le32(res, hdr.duration))
         return DMERR_FWRITE;