Enable more flexibility when processing updates to boolean-typed properties.

Author: malloch

src/map.c

@@ -2002,27 +2002,47 @@ int mpr_map_set_from_msg(mpr_map m, mpr_msg msg)
                 break;
             }
             case MPR_PROP_USE_INST: {
-                int use_inst;
-                if (types[0] == 's') {
-                    const char *str = &(vals[0])->s;
-                    if (!strchr("TFtf", str[0]))
+                int use_inst = -1;
+                switch (types[0]) {
+                    case MPR_STR: {
+                        const char *str = &(vals[0])->s;
+                        if (!strchr("TFtf", str[0]))
+                            break;
+                        if (strlen(str) == 1)
+                            use_inst = str[0] == 'T' || str[0] == 't';
+                        else if (strcmp(str + 1, "rue") == 0)
+                            use_inst = 1;
+                        else if (strcmp(str + 1, "alse") == 0)
+                            use_inst = 0;
+                        else
+                            break;
                         break;
-                    if (strlen(str) == 1)
-                        use_inst = str[0] == 'T' || str[0] == 't';
-                    else if (strcmp(str + 1, "rue") == 0)
+                    }
+                    case MPR_INT32:
+                        use_inst = 0 != (vals[0])->i32;
+                        break;
+                    case MPR_FLT:
+                        use_inst = 0.f != (vals[0])->f;
+                        break;
+                    case MPR_DBL:
+                        use_inst = 0. != (vals[0])->d;
+                        break;
+                    case 'T':
                         use_inst = 1;
-                    else if (strcmp(str + 1, "alse") == 0)
+                        break;
+                    case 'F':
                         use_inst = 0;
-                    else
+                        break;
+                    default:
                         break;
                 }
-                else
-                    use_inst = types[0] == 'T';
                 if (m->obj.is_local && m->use_inst && !use_inst) {
                     /* TODO: release map instances */
                 }
-                updated += mpr_tbl_add_record(tbl, MPR_PROP_USE_INST, NULL, 1, MPR_BOOL,
-                                              &use_inst, MPR_TBL_MOD_REM);
+                if (use_inst >= 0) {
+                    updated += mpr_tbl_add_record(tbl, MPR_PROP_USE_INST, NULL, 1, MPR_BOOL,
+                                                  &use_inst, MPR_TBL_MOD_REM);
+                }
                 break;
             }
             case MPR_PROP_EXTRA: {

src/mpr_type.h

@@ -40,6 +40,9 @@ MPR_INLINE static int mpr_type_get_is_num(mpr_type type)
         case MPR_INT32:
         case MPR_FLT:
         case MPR_DBL:
+        case MPR_BOOL:
+        case 'T':
+        case 'F':
             return 1;
         default:    return 0;
     }

src/property.c

@@ -25,7 +25,7 @@ const static_prop_t static_props[] = {
     { "@data",          1, 0  },        /* MPR_PROP_DATA */
     { "@device",        1, MPR_STR },   /* MPR_PROP_DEVICE */
     { "@direction",     1, MPR_STR },   /* MPR_PROP_DIR */
-    { "@ephemeral",     1, MPR_BOOL },  /* MPR_PROP_EPHEM */
+    { "@ephemeral",     1, 'n' },       /* MPR_PROP_EPHEM */
     { "@expr",          1, MPR_STR },   /* MPR_PROP_EXPR */
     { "@host",          1, MPR_STR },   /* MPR_PROP_HOST */
     { "@id",            1, MPR_INT64 }, /* MPR_PROP_ID */
@@ -36,7 +36,7 @@ const static_prop_t static_props[] = {
     { "@linked",        0, MPR_STR },   /* MPR_PROP_LINKED */
     { "@max",           0, 'n' },       /* MPR_PROP_MAX */
     { "@min",           0, 'n' },       /* MPR_PROP_MIN */
-    { "@muted",         1, MPR_BOOL },  /* MPR_PROP_MUTED */
+    { "@muted",         1, 'n' },       /* MPR_PROP_MUTED */
     { "@name",          1, MPR_STR },   /* MPR_PROP_NAME */
     { "@num_inst",      1, MPR_INT32 }, /* MPR_PROP_NUM_INST */
     { "@num_maps",      2, MPR_INT32 }, /* MPR_PROP_NUM_MAPS */
@@ -57,7 +57,7 @@ const static_prop_t static_props[] = {
     { "@synced",        1, MPR_TIME },  /* MPR_PROP_SYNCED */
     { "@type",          1, MPR_TYPE },  /* MPR_PROP_TYPE */
     { "@unit",          1, MPR_STR },   /* MPR_PROP_UNIT */
-    { "@use_inst",      1, MPR_BOOL },  /* MPR_PROP_USE_INST */
+    { "@use_inst",      1, 'n' },       /* MPR_PROP_USE_INST */
     { "@version",       1, MPR_INT32 }, /* MPR_PROP_VERSION */
     { "@extra",         0, 'a' },       /* MPR_PROP_EXTRA (special case, does not
                                          * represent a specific property name) */