summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2017-10-10 17:17:33 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2017-10-10 17:17:33 +0200
commitdb1ab668e8ff1518db2c5f8834cbb65e1d667894 (patch)
tree9d673de0b84118d2c0de2b5797aea6b1184f1877
parent74f1bde37dd4363e3fe3251b2a3567b3666d3a14 (diff)
downloaduca-net-db1ab668e8ff1518db2c5f8834cbb65e1d667894.tar.gz
uca-net-db1ab668e8ff1518db2c5f8834cbb65e1d667894.tar.bz2
uca-net-db1ab668e8ff1518db2c5f8834cbb65e1d667894.tar.xz
uca-net-db1ab668e8ff1518db2c5f8834cbb65e1d667894.zip
Support int64 and uint64 properties
-rw-r--r--uca-net-camera.c2
-rw-r--r--uca-net-protocol.h2
-rw-r--r--ucad.c4
3 files changed, 8 insertions, 0 deletions
diff --git a/uca-net-camera.c b/uca-net-camera.c
index 4d05863..39f591f 100644
--- a/uca-net-camera.c
+++ b/uca-net-camera.c
@@ -504,7 +504,9 @@ deserialize_param_spec (UcaNetMessageProperty *prop)
prop->spec.genum.default_value, prop->flags);
}
CASE_NUMERIC (G_TYPE_INT, int)
+ CASE_NUMERIC (G_TYPE_INT64, int64)
CASE_NUMERIC (G_TYPE_UINT, uint)
+ CASE_NUMERIC (G_TYPE_UINT64, uint64)
CASE_NUMERIC (G_TYPE_FLOAT, float)
CASE_NUMERIC (G_TYPE_DOUBLE, double)
default:
diff --git a/uca-net-protocol.h b/uca-net-protocol.h
index 1460cbd..fe097db 100644
--- a/uca-net-protocol.h
+++ b/uca-net-protocol.h
@@ -96,7 +96,9 @@ typedef struct {
gint values[UCA_NET_MAX_ENUM_LENGTH];
} genum;
NUMERIC_STRUCT (gint)
+ NUMERIC_STRUCT (gint64)
NUMERIC_STRUCT (guint)
+ NUMERIC_STRUCT (guint64)
NUMERIC_STRUCT (gfloat)
NUMERIC_STRUCT (gdouble)
} spec;
diff --git a/ucad.c b/ucad.c
index 28fbc16..35fb077 100644
--- a/ucad.c
+++ b/ucad.c
@@ -150,8 +150,12 @@ serialize_param_spec (GParamSpec *pspec, UcaNetMessageProperty *prop)
break;
CASE_NUMERIC (G_TYPE_INT, gint, GParamSpecInt)
break;
+ CASE_NUMERIC (G_TYPE_INT64, gint64, GParamSpecInt64)
+ break;
CASE_NUMERIC (G_TYPE_UINT, guint, GParamSpecUInt)
break;
+ CASE_NUMERIC (G_TYPE_UINT64, guint64, GParamSpecUInt64)
+ break;
CASE_NUMERIC (G_TYPE_FLOAT, gfloat, GParamSpecFloat)
break;
CASE_NUMERIC (G_TYPE_DOUBLE, gdouble, GParamSpecDouble)