From f29f4d8009d052959c1ed5144d7fd4fd3dd2a32d Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Sun, 15 Jun 2014 06:55:18 +0200
Subject: [PATCH 1/9] Unify obs_data_get* and obs_data_item_get* functions
 handling

---
 libobs/obs-data.c | 78 +++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 50 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index c2122ee01..9cc5faa95 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -479,16 +479,6 @@ static struct obs_data_item *get_item(struct obs_data *data, const char *name)
 	return NULL;
 }
 
-static inline struct obs_data_item *get_item_of(struct obs_data *data,
-		const char *name, enum obs_data_type type)
-{
-	if (!data)
-		return NULL;
-
-	struct obs_data_item *item = get_item(data, name);
-	return (item && item->type == type) ? item : NULL;
-}
-
 static void set_item_data(struct obs_data *data, struct obs_data_item *item,
 		const char *name, const void *ptr, size_t size,
 		enum obs_data_type type)
@@ -638,66 +628,32 @@ void obs_data_set_default_obj(obs_data_t data, const char *name, obs_data_t obj)
 
 const char *obs_data_getstring(obs_data_t data, const char *name)
 {
-	struct obs_data_item *item = get_item_of(data, name, OBS_DATA_STRING);
-	return item ? get_item_data(item) : "";
-}
-
-static inline long long item_int(struct obs_data_item *item)
-{
-	if (item) {
-		struct obs_data_number *num = get_item_data(item);
-		return (num->type == OBS_DATA_NUM_INT) ?
-			num->int_val : (long long)num->double_val;
-	}
-
-	return 0;
-}
-
-static inline double item_double(struct obs_data_item *item)
-{
-	if (item) {
-		struct obs_data_number *num = get_item_data(item);
-		return (num->type == OBS_DATA_NUM_INT) ?
-			(double)num->int_val : num->double_val;
-	}
-
-	return 0.0;
+	return obs_data_item_getstring(get_item(data, name));
 }
 
 long long obs_data_getint(obs_data_t data, const char *name)
 {
-	return item_int(get_item_of(data, name, OBS_DATA_NUMBER));
+	return obs_data_item_getint(get_item(data, name));
 }
 
 double obs_data_getdouble(obs_data_t data, const char *name)
 {
-	return item_double(get_item_of(data, name, OBS_DATA_NUMBER));
+	return obs_data_item_getdouble(get_item(data, name));
 }
 
 bool obs_data_getbool(obs_data_t data, const char *name)
 {
-	struct obs_data_item *item = get_item_of(data, name, OBS_DATA_BOOLEAN);
-	return item ? *(bool*)get_item_data(item) : false;
+	return obs_data_item_getbool(get_item(data, name));
 }
 
 obs_data_t obs_data_getobj(obs_data_t data, const char *name)
 {
-	struct obs_data_item *item = get_item_of(data, name, OBS_DATA_OBJECT);
-	obs_data_t obj = get_item_obj(item);
-
-	if (obj)
-		os_atomic_inc_long(&obj->ref);
-	return obj;
+	return obs_data_item_getobj(get_item(data, name));
 }
 
 obs_data_array_t obs_data_getarray(obs_data_t data, const char *name)
 {
-	struct obs_data_item *item = get_item_of(data, name, OBS_DATA_ARRAY);
-	obs_data_array_t array = get_item_array(item);
-
-	if (array)
-		os_atomic_inc_long(&array->ref);
-	return array;
+	return obs_data_item_getarray(get_item(data, name));
 }
 
 obs_data_array_t obs_data_array_create()
@@ -905,12 +861,34 @@ const char *obs_data_item_getstring(obs_data_item_t item)
 	return item_valid(item, OBS_DATA_STRING) ? get_item_data(item) : "";
 }
 
+static inline long long item_int(struct obs_data_item *item)
+{
+	if (item) {
+		struct obs_data_number *num = get_item_data(item);
+		return (num->type == OBS_DATA_NUM_INT) ?
+			num->int_val : (long long)num->double_val;
+	}
+
+	return 0;
+}
+
 long long obs_data_item_getint(obs_data_item_t item)
 {
 	return item_valid(item, OBS_DATA_NUMBER) ?
 		item_int(item) : 0;
 }
 
+static inline double item_double(struct obs_data_item *item)
+{
+	if (item) {
+		struct obs_data_number *num = get_item_data(item);
+		return (num->type == OBS_DATA_NUM_INT) ?
+			(double)num->int_val : num->double_val;
+	}
+
+	return 0.0;
+}
+
 double obs_data_item_getdouble(obs_data_item_t item)
 {
 	return item_valid(item, OBS_DATA_NUMBER) ?

From 23e2f623f9157929c70ba9bcd9c5f625afe8fe50 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 17:16:18 +0200
Subject: [PATCH 2/9] Unify obs_data_set* and obs_data_set_default_* function
 implementations

---
 libobs/obs-data.c | 178 ++++++++++++++++++++++++++++------------------
 1 file changed, 107 insertions(+), 71 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index 9cc5faa95..05ddf18c0 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -551,79 +551,109 @@ void obs_data_erase(obs_data_t data, const char *name)
 	}
 }
 
-void obs_data_setstring(obs_data_t data, const char *name, const char *val)
+typedef void (*set_item_t)(obs_data_t, const char*, const void*, size_t,
+		enum obs_data_type);
+
+static inline void data_set_string(obs_data_t data, const char *name,
+		const char *val, set_item_t set_item_)
 {
 	if (!val) val = "";
-	set_item(data, name, val, strlen(val)+1, OBS_DATA_STRING);
+	set_item_(data, name, val, strlen(val)+1, OBS_DATA_STRING);
 }
 
-void obs_data_setint(obs_data_t data, const char *name, long long val)
+static inline void data_set_int(obs_data_t data, const char *name,
+		long long val, set_item_t set_item_)
 {
 	struct obs_data_number num;
 	num.type    = OBS_DATA_NUM_INT;
 	num.int_val = val;
-	set_item(data, name, &num, sizeof(struct obs_data_number),
+	set_item_(data, name, &num, sizeof(struct obs_data_number),
 			OBS_DATA_NUMBER);
 }
 
-void obs_data_setdouble(obs_data_t data, const char *name, double val)
+static inline void data_set_double(obs_data_t data, const char *name,
+		double val, set_item_t set_item_)
 {
 	struct obs_data_number num;
 	num.type       = OBS_DATA_NUM_DOUBLE;
 	num.double_val = val;
-	set_item(data, name, &num, sizeof(struct obs_data_number),
+	set_item_(data, name, &num, sizeof(struct obs_data_number),
 			OBS_DATA_NUMBER);
 }
 
+static inline void data_set_bool(obs_data_t data, const char *name, bool val,
+		set_item_t set_item_)
+{
+	set_item_(data, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
+}
+
+static inline void data_set_obj(obs_data_t data, const char *name,
+		obs_data_t obj, set_item_t set_item_)
+{
+	set_item_(data, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
+}
+
+static inline void data_set_array(obs_data_t data, const char *name,
+		obs_data_array_t array, set_item_t set_item_)
+{
+	set_item_(data, name, &array, sizeof(obs_data_t), OBS_DATA_ARRAY);
+}
+
+void obs_data_setstring(obs_data_t data, const char *name, const char *val)
+{
+	data_set_string(data, name, val, set_item);
+}
+
+void obs_data_setint(obs_data_t data, const char *name, long long val)
+{
+	data_set_int(data, name, val, set_item);
+}
+
+void obs_data_setdouble(obs_data_t data, const char *name, double val)
+{
+	data_set_double(data, name, val, set_item);
+}
+
 void obs_data_setbool(obs_data_t data, const char *name, bool val)
 {
-	set_item(data, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
+	data_set_bool(data, name, val, set_item);
 }
 
 void obs_data_setobj(obs_data_t data, const char *name, obs_data_t obj)
 {
-	set_item(data, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
+	data_set_obj(data, name, obj, set_item);
 }
 
 void obs_data_setarray(obs_data_t data, const char *name,
 		obs_data_array_t array)
 {
-	set_item(data, name, &array, sizeof(obs_data_t), OBS_DATA_ARRAY);
+	data_set_array(data, name, array, set_item);
 }
 
 void obs_data_set_default_string(obs_data_t data, const char *name,
 		const char *val)
 {
-	if (!val) val = "";
-	set_item_def(data, name, val, strlen(val)+1, OBS_DATA_STRING);
+	data_set_string(data, name, val, set_item_def);
 }
 
 void obs_data_set_default_int(obs_data_t data, const char *name, long long val)
 {
-	struct obs_data_number num;
-	num.type    = OBS_DATA_NUM_INT;
-	num.int_val = val;
-	set_item_def(data, name, &num, sizeof(struct obs_data_number),
-			OBS_DATA_NUMBER);
+	data_set_int(data, name, val, set_item_def);
 }
 
 void obs_data_set_default_double(obs_data_t data, const char *name, double val)
 {
-	struct obs_data_number num;
-	num.type       = OBS_DATA_NUM_DOUBLE;
-	num.double_val = val;
-	set_item_def(data, name, &num, sizeof(struct obs_data_number),
-			OBS_DATA_NUMBER);
+	data_set_double(data, name, val, set_item_def);
 }
 
 void obs_data_set_default_bool(obs_data_t data, const char *name, bool val)
 {
-	set_item_def(data, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
+	data_set_bool(data, name, val, set_item_def);
 }
 
 void obs_data_set_default_obj(obs_data_t data, const char *name, obs_data_t obj)
 {
-	set_item_def(data, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
+	data_set_obj(data, name, obj, set_item_def);
 }
 
 const char *obs_data_getstring(obs_data_t data, const char *name)
@@ -923,94 +953,100 @@ obs_data_array_t obs_data_item_getarray(obs_data_item_t item)
 
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
-void obs_data_set_vec2(obs_data_t data, const char *name,
-		const struct vec2 *val)
+
+typedef void (*set_obj_t)(obs_data_t, const char*, obs_data_t);
+
+static inline void set_vec2(obs_data_t data, const char *name,
+		const struct vec2 *val, set_obj_t set_obj)
 {
 	obs_data_t obj = obs_data_create();
 	obs_data_setdouble(obj, "x", val->x);
 	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setobj(data, name, obj);
+	set_obj(data, name, obj);
 	obs_data_release(obj);
 }
 
+static inline void set_vec3(obs_data_t data, const char *name,
+		const struct vec3 *val, set_obj_t set_obj)
+{
+	obs_data_t obj = obs_data_create();
+	obs_data_setdouble(obj, "x", val->x);
+	obs_data_setdouble(obj, "y", val->y);
+	obs_data_setdouble(obj, "z", val->z);
+	set_obj(data, name, obj);
+	obs_data_release(obj);
+}
+
+static inline void set_vec4(obs_data_t data, const char *name,
+		const struct vec4 *val, set_obj_t set_obj)
+{
+	obs_data_t obj = obs_data_create();
+	obs_data_setdouble(obj, "x", val->x);
+	obs_data_setdouble(obj, "y", val->y);
+	obs_data_setdouble(obj, "z", val->z);
+	obs_data_setdouble(obj, "w", val->w);
+	set_obj(data, name, obj);
+	obs_data_release(obj);
+}
+
+static inline void set_quat(obs_data_t data, const char *name,
+		const struct quat *val, set_obj_t set_obj)
+{
+	obs_data_t obj = obs_data_create();
+	obs_data_setdouble(obj, "x", val->x);
+	obs_data_setdouble(obj, "y", val->y);
+	obs_data_setdouble(obj, "z", val->z);
+	obs_data_setdouble(obj, "w", val->w);
+	set_obj(data, name, obj);
+	obs_data_release(obj);
+}
+
+void obs_data_set_vec2(obs_data_t data, const char *name,
+		const struct vec2 *val)
+{
+	set_vec2(data, name, val, obs_data_setobj);
+}
+
 void obs_data_set_vec3(obs_data_t data, const char *name,
 		const struct vec3 *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_setobj(data, name, obj);
-	obs_data_release(obj);
+	set_vec3(data, name, val, obs_data_setobj);
 }
 
 void obs_data_set_vec4(obs_data_t data, const char *name,
 		const struct vec4 *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_setdouble(obj, "w", val->w);
-	obs_data_setobj(data, name, obj);
-	obs_data_release(obj);
+	set_vec4(data, name, val, obs_data_setobj);
 }
 
 void obs_data_set_quat(obs_data_t data, const char *name,
 		const struct quat *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_setdouble(obj, "w", val->w);
-	obs_data_setobj(data, name, obj);
-	obs_data_release(obj);
+	set_quat(data, name, val, obs_data_setobj);
 }
 
 void obs_data_set_default_vec2(obs_data_t data, const char *name,
 		const struct vec2 *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_set_default_obj(data, name, obj);
-	obs_data_release(obj);
+	set_vec2(data, name, val, obs_data_set_default_obj);
 }
 
 void obs_data_set_default_vec3(obs_data_t data, const char *name,
 		const struct vec3 *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_set_default_obj(data, name, obj);
-	obs_data_release(obj);
+	set_vec3(data, name, val, obs_data_set_default_obj);
 }
 
 void obs_data_set_default_vec4(obs_data_t data, const char *name,
 		const struct vec4 *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_setdouble(obj, "w", val->w);
-	obs_data_set_default_obj(data, name, obj);
-	obs_data_release(obj);
+	set_vec4(data, name, val, obs_data_set_default_obj);
 }
 
 void obs_data_set_default_quat(obs_data_t data, const char *name,
 		const struct quat *val)
 {
-	obs_data_t obj = obs_data_create();
-	obs_data_setdouble(obj, "x", val->x);
-	obs_data_setdouble(obj, "y", val->y);
-	obs_data_setdouble(obj, "z", val->z);
-	obs_data_setdouble(obj, "w", val->w);
-	obs_data_set_default_obj(data, name, obj);
-	obs_data_release(obj);
+	set_quat(data, name, val, obs_data_set_default_obj);
 }
 
 void obs_data_get_vec2(obs_data_t data, const char *name, struct vec2 *val)

From 0d77dc702d0033a3138ec6f1cba47b7e707e8adc Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 18:36:41 +0200
Subject: [PATCH 3/9] Refactor set_item(_def) to only look up items if no item
 is supplied

---
 libobs/obs-data.c | 80 +++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index 05ddf18c0..a64356051 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -483,7 +483,7 @@ static void set_item_data(struct obs_data *data, struct obs_data_item *item,
 		const char *name, const void *ptr, size_t size,
 		enum obs_data_type type)
 {
-	if (!item) {
+	if (!item && data) {
 		item = obs_data_item_create(name, ptr, size, type);
 		item->next = data->first_item;
 		item->parent = data;
@@ -495,23 +495,29 @@ static void set_item_data(struct obs_data *data, struct obs_data_item *item,
 	}
 }
 
-static inline void set_item(struct obs_data *data, const char *name,
+static inline void set_item(struct obs_data *data, obs_data_item_t item,
+		const char *name,
 		const void *ptr, size_t size, enum obs_data_type type)
 {
-	if (!data)
+	if (!data && !item)
 		return;
 
-	struct obs_data_item *item = get_item(data, name);
+	if (!item)
+		item = get_item(data, name);
+
 	set_item_data(data, item, name, ptr, size, type);
 }
 
-static inline void set_item_def(struct obs_data *data, const char *name,
+static inline void set_item_def(struct obs_data *data, obs_data_item_t item,
+		const char *name,
 		const void *ptr, size_t size, enum obs_data_type type)
 {
-	if (!data)
+	if (!data && !item)
 		return;
 
-	struct obs_data_item *item = get_item(data, name);
+	if (!item)
+		item = get_item(data, name);
+
 	if (item && item->type == type)
 		return;
 
@@ -523,7 +529,7 @@ static inline void copy_item(struct obs_data *data, struct obs_data_item *item)
 	const char *name = get_item_name(item);
 	void *ptr = get_item_data(item);
 
-	set_item(data, name, ptr, item->data_len, item->type);
+	set_item(data, NULL, name, ptr, item->data_len, item->type);
 }
 
 void obs_data_apply(obs_data_t target, obs_data_t apply_data)
@@ -551,109 +557,115 @@ void obs_data_erase(obs_data_t data, const char *name)
 	}
 }
 
-typedef void (*set_item_t)(obs_data_t, const char*, const void*, size_t,
-		enum obs_data_type);
+typedef void (*set_item_t)(obs_data_t, obs_data_item_t, const char*,
+		const void*, size_t, enum obs_data_type);
 
-static inline void data_set_string(obs_data_t data, const char *name,
+static inline void obs_set_string(obs_data_t data, obs_data_item_t item,
+		const char *name,
 		const char *val, set_item_t set_item_)
 {
 	if (!val) val = "";
-	set_item_(data, name, val, strlen(val)+1, OBS_DATA_STRING);
+	set_item_(data, item, name, val, strlen(val)+1, OBS_DATA_STRING);
 }
 
-static inline void data_set_int(obs_data_t data, const char *name,
+static inline void obs_set_int(obs_data_t data, obs_data_item_t item,
+		const char *name,
 		long long val, set_item_t set_item_)
 {
 	struct obs_data_number num;
 	num.type    = OBS_DATA_NUM_INT;
 	num.int_val = val;
-	set_item_(data, name, &num, sizeof(struct obs_data_number),
+	set_item_(data, item, name, &num, sizeof(struct obs_data_number),
 			OBS_DATA_NUMBER);
 }
 
-static inline void data_set_double(obs_data_t data, const char *name,
+static inline void obs_set_double(obs_data_t data, obs_data_item_t item,
+		const char *name,
 		double val, set_item_t set_item_)
 {
 	struct obs_data_number num;
 	num.type       = OBS_DATA_NUM_DOUBLE;
 	num.double_val = val;
-	set_item_(data, name, &num, sizeof(struct obs_data_number),
+	set_item_(data, item, name, &num, sizeof(struct obs_data_number),
 			OBS_DATA_NUMBER);
 }
 
-static inline void data_set_bool(obs_data_t data, const char *name, bool val,
-		set_item_t set_item_)
+static inline void obs_set_bool(obs_data_t data, obs_data_item_t item,
+		const char *name,
+		bool val, set_item_t set_item_)
 {
-	set_item_(data, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
+	set_item_(data, item, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
 }
 
-static inline void data_set_obj(obs_data_t data, const char *name,
+static inline void obs_set_obj(obs_data_t data, obs_data_item_t item,
+		const char *name,
 		obs_data_t obj, set_item_t set_item_)
 {
-	set_item_(data, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
+	set_item_(data, item, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
 }
 
-static inline void data_set_array(obs_data_t data, const char *name,
+static inline void obs_set_array(obs_data_t data, obs_data_item_t item,
+		const char *name,
 		obs_data_array_t array, set_item_t set_item_)
 {
-	set_item_(data, name, &array, sizeof(obs_data_t), OBS_DATA_ARRAY);
+	set_item_(data, item, name, &array, sizeof(obs_data_t), OBS_DATA_ARRAY);
 }
 
 void obs_data_setstring(obs_data_t data, const char *name, const char *val)
 {
-	data_set_string(data, name, val, set_item);
+	obs_set_string(data, NULL, name, val, set_item);
 }
 
 void obs_data_setint(obs_data_t data, const char *name, long long val)
 {
-	data_set_int(data, name, val, set_item);
+	obs_set_int(data, NULL, name, val, set_item);
 }
 
 void obs_data_setdouble(obs_data_t data, const char *name, double val)
 {
-	data_set_double(data, name, val, set_item);
+	obs_set_double(data, NULL, name, val, set_item);
 }
 
 void obs_data_setbool(obs_data_t data, const char *name, bool val)
 {
-	data_set_bool(data, name, val, set_item);
+	obs_set_bool(data, NULL, name, val, set_item);
 }
 
 void obs_data_setobj(obs_data_t data, const char *name, obs_data_t obj)
 {
-	data_set_obj(data, name, obj, set_item);
+	obs_set_obj(data, NULL, name, obj, set_item);
 }
 
 void obs_data_setarray(obs_data_t data, const char *name,
 		obs_data_array_t array)
 {
-	data_set_array(data, name, array, set_item);
+	obs_set_array(data, NULL, name, array, set_item);
 }
 
 void obs_data_set_default_string(obs_data_t data, const char *name,
 		const char *val)
 {
-	data_set_string(data, name, val, set_item_def);
+	obs_set_string(data, NULL, name, val, set_item_def);
 }
 
 void obs_data_set_default_int(obs_data_t data, const char *name, long long val)
 {
-	data_set_int(data, name, val, set_item_def);
+	obs_set_int(data, NULL, name, val, set_item_def);
 }
 
 void obs_data_set_default_double(obs_data_t data, const char *name, double val)
 {
-	data_set_double(data, name, val, set_item_def);
+	obs_set_double(data, NULL, name, val, set_item_def);
 }
 
 void obs_data_set_default_bool(obs_data_t data, const char *name, bool val)
 {
-	data_set_bool(data, name, val, set_item_def);
+	obs_set_bool(data, NULL, name, val, set_item_def);
 }
 
 void obs_data_set_default_obj(obs_data_t data, const char *name, obs_data_t obj)
 {
-	data_set_obj(data, name, obj, set_item_def);
+	obs_set_obj(data, NULL, name, obj, set_item_def);
 }
 
 const char *obs_data_getstring(obs_data_t data, const char *name)

From 92e9284270b9771b2ad416ab916e7eaec2885e96 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 19:40:01 +0200
Subject: [PATCH 4/9] Refactor obs-data internals to forward reallocation
 results to callers

---
 libobs/obs-data.c | 52 ++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index a64356051..475bfad55 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -479,46 +479,56 @@ static struct obs_data_item *get_item(struct obs_data *data, const char *name)
 	return NULL;
 }
 
-static void set_item_data(struct obs_data *data, struct obs_data_item *item,
+static void set_item_data(struct obs_data *data, struct obs_data_item **item,
 		const char *name, const void *ptr, size_t size,
 		enum obs_data_type type)
 {
-	if (!item && data) {
-		item = obs_data_item_create(name, ptr, size, type);
-		item->next = data->first_item;
-		item->parent = data;
+	obs_data_item_t new_item = NULL;
 
-		data->first_item = item;
+	if ((!item || (item && !*item)) && data) {
+		new_item = obs_data_item_create(name, ptr, size, type);
+		new_item->next = data->first_item;
+		new_item->parent = data;
+
+		data->first_item = new_item;
 
 	} else {
-		obs_data_item_setdata(&item, ptr, size, type);
+		obs_data_item_setdata(item, ptr, size, type);
 	}
 }
 
-static inline void set_item(struct obs_data *data, obs_data_item_t item,
+static inline void set_item(struct obs_data *data, obs_data_item_t *item,
 		const char *name,
 		const void *ptr, size_t size, enum obs_data_type type)
 {
+	obs_data_item_t actual_item = NULL;
+
 	if (!data && !item)
 		return;
 
-	if (!item)
-		item = get_item(data, name);
+	if (!item) {
+		actual_item = get_item(data, name);
+		item = &actual_item;
+	}
 
 	set_item_data(data, item, name, ptr, size, type);
 }
 
-static inline void set_item_def(struct obs_data *data, obs_data_item_t item,
+static inline void set_item_def(struct obs_data *data, obs_data_item_t *item,
 		const char *name,
 		const void *ptr, size_t size, enum obs_data_type type)
 {
+	obs_data_item_t actual_item = NULL;
+
 	if (!data && !item)
 		return;
 
-	if (!item)
-		item = get_item(data, name);
+	if (!item) {
+		actual_item = get_item(data, name);
+		item = &actual_item;
+	}
 
-	if (item && item->type == type)
+	if (item && *item && (*item)->type == type)
 		return;
 
 	set_item_data(data, item, name, ptr, size, type);
@@ -557,10 +567,10 @@ void obs_data_erase(obs_data_t data, const char *name)
 	}
 }
 
-typedef void (*set_item_t)(obs_data_t, obs_data_item_t, const char*,
+typedef void (*set_item_t)(obs_data_t, obs_data_item_t*, const char*,
 		const void*, size_t, enum obs_data_type);
 
-static inline void obs_set_string(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_string(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		const char *val, set_item_t set_item_)
 {
@@ -568,7 +578,7 @@ static inline void obs_set_string(obs_data_t data, obs_data_item_t item,
 	set_item_(data, item, name, val, strlen(val)+1, OBS_DATA_STRING);
 }
 
-static inline void obs_set_int(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_int(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		long long val, set_item_t set_item_)
 {
@@ -579,7 +589,7 @@ static inline void obs_set_int(obs_data_t data, obs_data_item_t item,
 			OBS_DATA_NUMBER);
 }
 
-static inline void obs_set_double(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_double(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		double val, set_item_t set_item_)
 {
@@ -590,21 +600,21 @@ static inline void obs_set_double(obs_data_t data, obs_data_item_t item,
 			OBS_DATA_NUMBER);
 }
 
-static inline void obs_set_bool(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_bool(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		bool val, set_item_t set_item_)
 {
 	set_item_(data, item, name, &val, sizeof(bool), OBS_DATA_BOOLEAN);
 }
 
-static inline void obs_set_obj(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_obj(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		obs_data_t obj, set_item_t set_item_)
 {
 	set_item_(data, item, name, &obj, sizeof(obs_data_t), OBS_DATA_OBJECT);
 }
 
-static inline void obs_set_array(obs_data_t data, obs_data_item_t item,
+static inline void obs_set_array(obs_data_t data, obs_data_item_t *item,
 		const char *name,
 		obs_data_array_t array, set_item_t set_item_)
 {

From 7cbc260f90f976f8d18fea6e26089c8ce97112c5 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 19:40:38 +0200
Subject: [PATCH 5/9] Unify obs_data_set* and obs_data_item_set* funtion
 implementations

---
 libobs/obs-data.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index 475bfad55..87ec3e419 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -864,42 +864,32 @@ enum obs_data_number_type obs_data_item_numtype(obs_data_item_t item)
 
 void obs_data_item_setstring(obs_data_item_t *item, const char *val)
 {
-	if (!val) val = "";
-	obs_data_item_setdata(item, val, strlen(val)+1, OBS_DATA_STRING);
+	obs_set_string(NULL, item, NULL, val, set_item);
 }
 
 void obs_data_item_setint(obs_data_item_t *item, long long val)
 {
-	struct obs_data_number num;
-	num.type    = OBS_DATA_NUM_INT;
-	num.int_val = val;
-	obs_data_item_setdata(item, &num, sizeof(struct obs_data_number),
-			OBS_DATA_NUMBER);
+	obs_set_int(NULL, item, NULL, val, set_item);
 }
 
 void obs_data_item_setdouble(obs_data_item_t *item, double val)
 {
-	struct obs_data_number num;
-	num.type       = OBS_DATA_NUM_DOUBLE;
-	num.double_val = val;
-	obs_data_item_setdata(item, &num, sizeof(struct obs_data_number),
-			OBS_DATA_NUMBER);
+	obs_set_double(NULL, item, NULL, val, set_item);
 }
 
 void obs_data_item_setbool(obs_data_item_t *item, bool val)
 {
-	obs_data_item_setdata(item, &val, sizeof(bool), OBS_DATA_BOOLEAN);
+	obs_set_bool(NULL, item, NULL, val, set_item);
 }
 
 void obs_data_item_setobj(obs_data_item_t *item, obs_data_t val)
 {
-	obs_data_item_setdata(item, &val, sizeof(obs_data_t), OBS_DATA_OBJECT);
+	obs_set_obj(NULL, item, NULL, val, set_item);
 }
 
 void obs_data_item_setarray(obs_data_item_t *item, obs_data_array_t val)
 {
-	obs_data_item_setdata(item, &val, sizeof(obs_data_array_t),
-			OBS_DATA_ARRAY);
+	obs_set_array(NULL, item, NULL, val, set_item);
 }
 
 static inline bool item_valid(struct obs_data_item *item,

From a6b52156b239d75cd895023bd118c9a33239630a Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Sun, 15 Jun 2014 06:55:18 +0200
Subject: [PATCH 6/9] Move obs-data accessor value handling logic into static
 helper functions

---
 libobs/obs-data.c | 151 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 106 insertions(+), 45 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index 87ec3e419..5402c6fb7 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -898,15 +898,20 @@ static inline bool item_valid(struct obs_data_item *item,
 	return item && item->type == type;
 }
 
-const char *obs_data_item_getstring(obs_data_item_t item)
+typedef void *(*get_data_t)(obs_data_item_t);
+
+static inline const char *data_item_get_string(obs_data_item_t item,
+		get_data_t get_data)
 {
-	return item_valid(item, OBS_DATA_STRING) ? get_item_data(item) : "";
+	return item_valid(item, OBS_DATA_STRING) && get_data(item) ?
+		get_data(item) : "";
 }
 
-static inline long long item_int(struct obs_data_item *item)
+static inline long long item_int(struct obs_data_item *item,
+		get_data_t get_data)
 {
-	if (item) {
-		struct obs_data_number *num = get_item_data(item);
+	if (item && get_data(item)) {
+		struct obs_data_number *num = get_data(item);
 		return (num->type == OBS_DATA_NUM_INT) ?
 			num->int_val : (long long)num->double_val;
 	}
@@ -914,16 +919,18 @@ static inline long long item_int(struct obs_data_item *item)
 	return 0;
 }
 
-long long obs_data_item_getint(obs_data_item_t item)
+static inline long long data_item_get_int(obs_data_item_t item,
+		get_data_t get_data)
 {
-	return item_valid(item, OBS_DATA_NUMBER) ?
-		item_int(item) : 0;
+	return item_int(item_valid(item, OBS_DATA_NUMBER) ? item : NULL,
+			get_data);
 }
 
-static inline double item_double(struct obs_data_item *item)
+static inline double item_double(struct obs_data_item *item,
+		get_data_t get_data)
 {
-	if (item) {
-		struct obs_data_number *num = get_item_data(item);
+	if (item && get_data(item)) {
+		struct obs_data_number *num = get_data(item);
 		return (num->type == OBS_DATA_NUM_INT) ?
 			(double)num->int_val : num->double_val;
 	}
@@ -931,38 +938,70 @@ static inline double item_double(struct obs_data_item *item)
 	return 0.0;
 }
 
-double obs_data_item_getdouble(obs_data_item_t item)
+static inline double data_item_get_double(obs_data_item_t item,
+		get_data_t get_data)
 {
-	return item_valid(item, OBS_DATA_NUMBER) ?
-		item_double(item) : 0.0;
+	return item_double(item_valid(item, OBS_DATA_NUMBER) ? item : NULL,
+			get_data);
 }
 
-bool obs_data_item_getbool(obs_data_item_t item)
+static inline bool data_item_get_bool(obs_data_item_t item, get_data_t get_data)
 {
-	return item_valid(item, OBS_DATA_BOOLEAN) ?
-		*(bool*)get_item_data(item) : false;
+	return item_valid(item, OBS_DATA_BOOLEAN) && get_data(item) ?
+		*(bool*)get_data(item) : false;
 }
 
-obs_data_t obs_data_item_getobj(obs_data_item_t item)
+typedef obs_data_t (*get_obj_t)(obs_data_item_t);
+
+static inline obs_data_t data_item_get_obj(obs_data_item_t item,
+		get_obj_t get_obj)
 {
 	obs_data_t obj = item_valid(item, OBS_DATA_OBJECT) ?
-		get_item_obj(item) : NULL;
+		get_obj(item) : NULL;
 
 	if (obj)
 		os_atomic_inc_long(&obj->ref);
 	return obj;
 }
 
-obs_data_array_t obs_data_item_getarray(obs_data_item_t item)
+typedef obs_data_array_t (*get_array_t)(obs_data_item_t);
+
+static inline obs_data_array_t data_item_get_array(obs_data_item_t item,
+		get_array_t get_array)
 {
 	obs_data_array_t array = item_valid(item, OBS_DATA_ARRAY) ?
-		get_item_array(item) : NULL;
+		get_array(item) : NULL;
 
 	if (array)
 		os_atomic_inc_long(&array->ref);
 	return array;
 }
 
+const char *obs_data_item_getstring(obs_data_item_t item)
+{
+	return data_item_get_string(item, get_item_data);
+}
+
+long long obs_data_item_getint(obs_data_item_t item)
+{
+	return data_item_get_int(item, get_item_data);
+}
+
+double obs_data_item_getdouble(obs_data_item_t item)
+{
+	return data_item_get_double(item, get_item_data);
+}
+
+bool obs_data_item_getbool(obs_data_item_t item)
+{
+	return data_item_get_bool(item, get_item_data);
+}
+
+obs_data_t obs_data_item_getobj(obs_data_item_t item)
+{
+	return data_item_get_obj(item, get_item_obj);
+}
+
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
 
@@ -1061,9 +1100,8 @@ void obs_data_set_default_quat(obs_data_t data, const char *name,
 	set_quat(data, name, val, obs_data_set_default_obj);
 }
 
-void obs_data_get_vec2(obs_data_t data, const char *name, struct vec2 *val)
+static inline void get_vec2(obs_data_t obj, struct vec2 *val)
 {
-	obs_data_t obj = obs_data_getobj(data, name);
 	if (!obj) return;
 
 	val->x = (float)obs_data_getdouble(obj, "x");
@@ -1071,37 +1109,60 @@ void obs_data_get_vec2(obs_data_t data, const char *name, struct vec2 *val)
 	obs_data_release(obj);
 }
 
+static inline void get_vec3(obs_data_t obj, struct vec3 *val)
+{
+	if (!obj) return;
+
+	val->x = (float)obs_data_getdouble(obj, "x");
+	val->y = (float)obs_data_getdouble(obj, "y");
+	val->z = (float)obs_data_getdouble(obj, "z");
+	obs_data_release(obj);
+}
+
+static inline void get_vec4(obs_data_t obj, struct vec4 *val)
+{
+	if (!obj) return;
+
+	val->x = (float)obs_data_getdouble(obj, "x");
+	val->y = (float)obs_data_getdouble(obj, "y");
+	val->z = (float)obs_data_getdouble(obj, "z");
+	val->w = (float)obs_data_getdouble(obj, "w");
+	obs_data_release(obj);
+}
+
+static inline void get_quat(obs_data_t obj, struct quat *val)
+{
+	if (!obj) return;
+
+	val->x = (float)obs_data_getdouble(obj, "x");
+	val->y = (float)obs_data_getdouble(obj, "y");
+	val->z = (float)obs_data_getdouble(obj, "z");
+	val->w = (float)obs_data_getdouble(obj, "w");
+	obs_data_release(obj);
+}
+
+void obs_data_get_vec2(obs_data_t data, const char *name, struct vec2 *val)
+{
+	get_vec2(obs_data_getobj(data, name), val);
+}
+
 void obs_data_get_vec3(obs_data_t data, const char *name, struct vec3 *val)
 {
-	obs_data_t obj = obs_data_getobj(data, name);
-	if (!obj) return;
-
-	val->x = (float)obs_data_getdouble(obj, "x");
-	val->y = (float)obs_data_getdouble(obj, "y");
-	val->z = (float)obs_data_getdouble(obj, "z");
-	obs_data_release(obj);
+	get_vec3(obs_data_getobj(data, name), val);
 }
 
 void obs_data_get_vec4(obs_data_t data, const char *name, struct vec4 *val)
 {
-	obs_data_t obj = obs_data_getobj(data, name);
-	if (!obj) return;
-
-	val->x = (float)obs_data_getdouble(obj, "x");
-	val->y = (float)obs_data_getdouble(obj, "y");
-	val->z = (float)obs_data_getdouble(obj, "z");
-	val->w = (float)obs_data_getdouble(obj, "w");
-	obs_data_release(obj);
+	get_vec4(obs_data_getobj(data, name), val);
 }
 
 void obs_data_get_quat(obs_data_t data, const char *name, struct quat *val)
 {
-	obs_data_t obj = obs_data_getobj(data, name);
-	if (!obj) return;
+	get_quat(obs_data_getobj(data, name), val);
+}
 
-	val->x = (float)obs_data_getdouble(obj, "x");
-	val->y = (float)obs_data_getdouble(obj, "y");
-	val->z = (float)obs_data_getdouble(obj, "z");
-	val->w = (float)obs_data_getdouble(obj, "w");
-	obs_data_release(obj);
+void obs_data_get_default_vec2(obs_data_t data, const char *name,
+		struct vec2 *val)
+{
+	get_vec2(obs_data_get_default_obj(data, name), val);
 }

From 7f172eb1b45ad9902c3263a74c959fd8fb5ee421 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 20:55:09 +0200
Subject: [PATCH 7/9] Change semantics of obs-data default values

Default values are now permanently stored in the obs_data_items and
can be accessed via the new get_default functions

Also default values are no longer serialized to JSON to ease transition
to new default values
---
 libobs/obs-data.c | 336 ++++++++++++++++++++++++++++++++++++++++++++--
 libobs/obs-data.h |  57 +++++++-
 2 files changed, 375 insertions(+), 18 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index 5402c6fb7..d4218dc42 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -33,6 +33,8 @@ struct obs_data_item {
 	enum obs_data_type   type;
 	size_t               name_len;
 	size_t               data_len;
+	size_t               data_size;
+	size_t               default_size;
 	size_t               capacity;
 };
 
@@ -58,6 +60,12 @@ struct obs_data_number {
 /* ------------------------------------------------------------------------- */
 /* Item structure, designed to be one allocation only */
 
+static inline size_t get_align_size(size_t size)
+{
+	const size_t alignment = base_get_alignment();
+	return (size + alignment - 1) & ~(alignment - 1);
+}
+
 /* ensures data after the name has alignment (in case of SSE) */
 static inline size_t get_name_align_size(const char *name)
 {
@@ -76,14 +84,32 @@ static inline char *get_item_name(struct obs_data_item *item)
 	return (char*)item + sizeof(struct obs_data_item);
 }
 
-static inline void *get_item_data(struct obs_data_item *item)
+static inline void *get_data_ptr(obs_data_item_t item)
 {
 	return (uint8_t*)get_item_name(item) + item->name_len;
 }
 
+static inline void *get_item_data(struct obs_data_item *item)
+{
+	if (!item->data_size && !item->default_size)
+		return NULL;
+	return get_data_ptr(item);
+}
+
+static inline void *get_default_data_ptr(obs_data_item_t item)
+{
+	return (uint8_t*)get_data_ptr(item) + item->data_len;
+}
+
+static inline void *get_item_default_data(struct obs_data_item *item)
+{
+	return item->default_size ? get_default_data_ptr(item) : NULL;
+}
+
 static inline size_t obs_data_item_total_size(struct obs_data_item *item)
 {
-	return sizeof(struct obs_data_item) + item->data_len + item->name_len;
+	return sizeof(struct obs_data_item) + item->name_len +
+		item->data_len + item->default_size;
 }
 
 static inline obs_data_t get_item_obj(struct obs_data_item *item)
@@ -94,6 +120,14 @@ static inline obs_data_t get_item_obj(struct obs_data_item *item)
 	return *(obs_data_t*)get_item_data(item);
 }
 
+static inline obs_data_t get_item_default_obj(struct obs_data_item *item)
+{
+	if (!item || !item->default_size)
+		return NULL;
+
+	return *(obs_data_t*)get_item_data(item);
+}
+
 static inline obs_data_array_t get_item_array(struct obs_data_item *item)
 {
 	if (!item)
@@ -102,8 +136,20 @@ static inline obs_data_array_t get_item_array(struct obs_data_item *item)
 	return *(obs_data_array_t*)get_item_data(item);
 }
 
+static inline obs_data_array_t get_item_default_array(
+		struct obs_data_item *item)
+{
+	if (!item || !item->default_size)
+		return NULL;
+
+	return *(obs_data_array_t*)get_item_data(item);
+}
+
 static inline void item_data_release(struct obs_data_item *item)
 {
+	if (!obs_data_item_has_user_value(item))
+		return;
+
 	if (item->type == OBS_DATA_OBJECT) {
 		obs_data_t obj = get_item_obj(item);
 		obs_data_release(obj);
@@ -114,6 +160,18 @@ static inline void item_data_release(struct obs_data_item *item)
 	}
 }
 
+static inline void item_default_data_release(struct obs_data_item *item)
+{
+	if (item->type == OBS_DATA_OBJECT) {
+		obs_data_t obj = get_item_default_obj(item);
+		obs_data_release(obj);
+
+	} else if (item->type == OBS_DATA_ARRAY) {
+		obs_data_array_t array = get_item_default_array(item);
+		obs_data_array_release(array);
+	}
+}
+
 static inline void item_data_addref(struct obs_data_item *item)
 {
 	if (item->type == OBS_DATA_OBJECT) {
@@ -126,8 +184,24 @@ static inline void item_data_addref(struct obs_data_item *item)
 	}
 }
 
+static inline void item_default_data_addref(struct obs_data_item *item)
+{
+	if (!item->data_size)
+		return;
+
+	if (item->type == OBS_DATA_OBJECT) {
+		obs_data_t obj = get_item_default_obj(item);
+		obs_data_addref(obj);
+
+	} else if (item->type == OBS_DATA_ARRAY) {
+		obs_data_array_t array = get_item_default_array(item);
+		obs_data_array_addref(array);
+	}
+}
+
 static struct obs_data_item *obs_data_item_create(const char *name,
-		const void *data, size_t size, enum obs_data_type type)
+		const void *data, size_t size, enum obs_data_type type,
+		bool default_data)
 {
 	struct obs_data_item *item;
 	size_t name_size, total_size;
@@ -143,9 +217,16 @@ static struct obs_data_item *obs_data_item_create(const char *name,
 	item->capacity = total_size;
 	item->type     = type;
 	item->name_len = name_size;
-	item->data_len = size;
 	item->ref      = 1;
 
+	if (default_data) {
+		item->default_size = size;
+
+	} else {
+		item->data_len = size;
+		item->data_size = size;
+	}
+
 	strcpy(get_item_name(item), name);
 	memcpy(get_item_data(item), data, size);
 
@@ -213,10 +294,23 @@ static struct obs_data_item *obs_data_item_ensure_capacity(
 static inline void obs_data_item_destroy(struct obs_data_item *item)
 {
 	item_data_release(item);
+	item_default_data_release(item);
 	obs_data_item_detach(item);
 	bfree(item);
 }
 
+static inline void move_data(obs_data_item_t old_item, void *old_data,
+		obs_data_item_t item, void *data, size_t len)
+{
+	ptrdiff_t old_offset = (uint8_t*)old_data - (uint8_t*)old_item;
+	ptrdiff_t new_offset = (uint8_t*)data - (uint8_t*)item;
+
+	if (!old_data)
+		return;
+
+	memmove((uint8_t*)item + new_offset, (uint8_t*)item + old_offset, len);
+}
+
 static inline void obs_data_item_setdata(
 		struct obs_data_item **p_item, const void *data, size_t size,
 		enum obs_data_type type)
@@ -225,12 +319,20 @@ static inline void obs_data_item_setdata(
 		return;
 
 	struct obs_data_item *item = *p_item;
+	void *old_non_user_data = get_default_data_ptr(item);
 	item_data_release(item);
 
-	item->data_len = size;
-	item->type     = type;
+	item->data_size = size;
+	item->type      = type;
+	item->data_len  = item->default_size ? 
+		get_align_size(size) : size;
 	item = obs_data_item_ensure_capacity(item);
 
+	if (item->default_size)
+		move_data(*p_item, old_non_user_data, item,
+				get_default_data_ptr(item),
+				item->default_len + item->autoselect_size);
+
 	if (size) {
 		memcpy(get_item_data(item), data, size);
 		item_data_addref(item);
@@ -239,6 +341,30 @@ static inline void obs_data_item_setdata(
 	*p_item = item;
 }
 
+static inline void obs_data_item_set_default_data(
+		struct obs_data_item **p_item, const void *data, size_t size,
+		enum obs_data_type type)
+{
+	if (!p_item || !*p_item)
+		return;
+
+	struct obs_data_item *item = *p_item;
+	item_default_data_release(item);
+
+	item->type         = type;
+	item->default_size = size;
+	item->data_len     = item->data_size ?
+				get_align_size(item->data_size) : 0;
+	item = obs_data_item_ensure_capacity(item);
+
+	if (size) {
+		memcpy(get_item_default_data(item), data, size);
+		item_default_data_addref(item);
+	}
+
+	*p_item = item;
+}
+
 /* ------------------------------------------------------------------------- */
 
 static void obs_data_add_json_item(obs_data_t data, const char *key,
@@ -367,12 +493,15 @@ static inline void set_json_array(json_t *json, const char *name,
 static json_t *obs_data_to_json(obs_data_t data)
 {
 	json_t *json = json_object();
-	obs_data_item_t item = obs_data_first(data);
+	obs_data_item_t item = NULL;
 
-	while (item) {
+	for (item = obs_data_first(data); item; obs_data_item_next(&item)) {
 		enum obs_data_type type = obs_data_item_gettype(item);
 		const char *name        = get_item_name(item);
 
+		if (!obs_data_item_has_user_value(item))
+			continue;
+
 		if (type == OBS_DATA_STRING)
 			set_json_string(json, name, item);
 		else if (type == OBS_DATA_NUMBER)
@@ -383,8 +512,6 @@ static json_t *obs_data_to_json(obs_data_t data)
 			set_json_obj(json, name, item);
 		else if (type == OBS_DATA_ARRAY)
 			set_json_array(json, name, item);
-
-		obs_data_item_next(&item);
 	}
 
 	return json;
@@ -481,17 +608,21 @@ static struct obs_data_item *get_item(struct obs_data *data, const char *name)
 
 static void set_item_data(struct obs_data *data, struct obs_data_item **item,
 		const char *name, const void *ptr, size_t size,
-		enum obs_data_type type)
+		enum obs_data_type type,
+		bool default_data)
 {
 	obs_data_item_t new_item = NULL;
 
 	if ((!item || (item && !*item)) && data) {
-		new_item = obs_data_item_create(name, ptr, size, type);
+		new_item = obs_data_item_create(name, ptr, size, type,
+				default_data);
 		new_item->next = data->first_item;
 		new_item->parent = data;
 
 		data->first_item = new_item;
 
+	} else if (default_data) {
+		obs_data_item_set_default_data(item, ptr, size, type);
 	} else {
 		obs_data_item_setdata(item, ptr, size, type);
 	}
@@ -511,7 +642,7 @@ static inline void set_item(struct obs_data *data, obs_data_item_t *item,
 		item = &actual_item;
 	}
 
-	set_item_data(data, item, name, ptr, size, type);
+	set_item_data(data, item, name, ptr, size, type, false);
 }
 
 static inline void set_item_def(struct obs_data *data, obs_data_item_t *item,
@@ -531,7 +662,7 @@ static inline void set_item_def(struct obs_data *data, obs_data_item_t *item,
 	if (item && *item && (*item)->type == type)
 		return;
 
-	set_item_data(data, item, name, ptr, size, type);
+	set_item_data(data, item, name, ptr, size, type, true);
 }
 
 static inline void copy_item(struct obs_data *data, struct obs_data_item *item)
@@ -708,6 +839,36 @@ obs_data_array_t obs_data_getarray(obs_data_t data, const char *name)
 	return obs_data_item_getarray(get_item(data, name));
 }
 
+const char *obs_data_get_default_string(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_string(get_item(data, name));
+}
+
+long long obs_data_get_default_int(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_int(get_item(data, name));
+}
+
+double obs_data_get_default_double(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_double(get_item(data, name));
+}
+
+bool obs_data_get_default_bool(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_bool(get_item(data, name));
+}
+
+obs_data_t obs_data_get_default_obj(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_obj(get_item(data, name));
+}
+
+obs_data_array_t obs_data_get_default_array(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_default_array(get_item(data, name));
+}
+
 obs_data_array_t obs_data_array_create()
 {
 	struct obs_data_array *array = bzalloc(sizeof(struct obs_data_array));
@@ -786,6 +947,69 @@ void obs_data_array_erase(obs_data_array_t array, size_t idx)
 	}
 }
 
+/* ------------------------------------------------------------------------- */
+/* Item status inspection */
+
+bool obs_data_has_user_value(obs_data_t data, const char *name)
+{
+	return data && obs_data_item_has_user_value(get_item(data, name));
+}
+
+bool obs_data_has_default(obs_data_t data, const char *name)
+{
+	return data && obs_data_item_has_default(get_item(data, name));
+}
+
+bool obs_data_item_has_user_value(obs_data_item_t item)
+{
+	return item && item->data_size;
+}
+
+bool obs_data_item_has_default(obs_data_item_t item)
+{
+	return item && item->default_size;
+}
+
+/* ------------------------------------------------------------------------- */
+/* Clearing data values */
+
+void obs_data_unset_user_value(obs_data_t data, const char *name)
+{
+	obs_data_item_unset_user_value(get_item(data, name));
+}
+
+void obs_data_unset_default_value(obs_data_t data, const char *name)
+{
+	obs_data_item_unset_default_value(get_item(data, name));
+}
+
+void obs_data_item_unset_user_value(obs_data_item_t item)
+{
+	if (!item || !item->data_size)
+		return;
+
+	void *old_non_user_data = get_default_data_ptr(item);
+
+	item_data_release(item);
+	item->data_size = 0;
+	item->data_len = 0;
+
+	if (item->default_size)
+		move_data(item, old_non_user_data, item,
+				get_default_data_ptr(item),
+				item->default_len);
+}
+
+void obs_data_item_unset_default_value(obs_data_item_t item)
+{
+	if (!item || !item->default_size)
+		return;
+
+	item_default_data_release(item);
+	item->default_size = 0;
+
+}
+
 /* ------------------------------------------------------------------------- */
 /* Item iteration */
 
@@ -892,6 +1116,37 @@ void obs_data_item_setarray(obs_data_item_t *item, obs_data_array_t val)
 	obs_set_array(NULL, item, NULL, val, set_item);
 }
 
+void obs_data_item_set_default_string(obs_data_item_t *item, const char *val)
+{
+	obs_set_string(NULL, item, NULL, val, set_item_def);
+}
+
+void obs_data_item_set_default_int(obs_data_item_t *item, long long val)
+{
+	obs_set_int(NULL, item, NULL, val, set_item_def);
+}
+
+void obs_data_item_set_default_double(obs_data_item_t *item, double val)
+{
+	obs_set_double(NULL, item, NULL, val, set_item_def);
+}
+
+void obs_data_item_set_default_bool(obs_data_item_t *item, bool val)
+{
+	obs_set_bool(NULL, item, NULL, val, set_item_def);
+}
+
+void obs_data_item_set_default_obj(obs_data_item_t *item, obs_data_t val)
+{
+	obs_set_obj(NULL, item, NULL, val, set_item_def);
+}
+
+void obs_data_item_set_default_array(obs_data_item_t *item,
+		obs_data_array_t val)
+{
+	obs_set_array(NULL, item, NULL, val, set_item_def);
+}
+
 static inline bool item_valid(struct obs_data_item *item,
 		enum obs_data_type type)
 {
@@ -1002,6 +1257,41 @@ obs_data_t obs_data_item_getobj(obs_data_item_t item)
 	return data_item_get_obj(item, get_item_obj);
 }
 
+obs_data_array_t obs_data_item_getarray(obs_data_item_t item)
+{
+	return data_item_get_array(item, get_item_array);
+}
+
+const char *obs_data_item_get_default_string(obs_data_item_t item)
+{
+	return data_item_get_string(item, get_item_default_data);
+}
+
+long long obs_data_item_get_default_int(obs_data_item_t item)
+{
+	return data_item_get_int(item, get_item_default_data);
+}
+
+double obs_data_item_get_default_double(obs_data_item_t item)
+{
+	return data_item_get_double(item, get_item_default_data);
+}
+
+bool obs_data_item_get_default_bool(obs_data_item_t item)
+{
+	return data_item_get_bool(item, get_item_default_data);
+}
+
+obs_data_t obs_data_item_get_default_obj(obs_data_item_t item)
+{
+	return data_item_get_obj(item, get_item_obj);
+}
+
+obs_data_array_t obs_data_item_get_default_array(obs_data_item_t item)
+{
+	return data_item_get_array(item, get_item_array);
+}
+
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
 
@@ -1166,3 +1456,21 @@ void obs_data_get_default_vec2(obs_data_t data, const char *name,
 {
 	get_vec2(obs_data_get_default_obj(data, name), val);
 }
+
+void obs_data_get_default_vec3(obs_data_t data, const char *name,
+		struct vec3 *val)
+{
+	get_vec3(obs_data_get_default_obj(data, name), val);
+}
+
+void obs_data_get_default_vec4(obs_data_t data, const char *name,
+		struct vec4 *val)
+{
+	get_vec4(obs_data_get_default_obj(data, name), val);
+}
+
+void obs_data_get_default_quat(obs_data_t data, const char *name,
+		struct quat *val)
+{
+	get_quat(obs_data_get_default_obj(data, name), val);
+}
diff --git a/libobs/obs-data.h b/libobs/obs-data.h
index 29d3d4fe5..0e48f6616 100644
--- a/libobs/obs-data.h
+++ b/libobs/obs-data.h
@@ -84,9 +84,6 @@ EXPORT void obs_data_setarray(obs_data_t data, const char *name,
 
 /*
  * Default value functions.
- *
- * These functions check to ensure the value exists, and is of a specific type.
- * If not, it sets the default value instead.
  */
 EXPORT void obs_data_set_default_string(obs_data_t data, const char *name,
 		const char *val);
@@ -101,7 +98,6 @@ EXPORT void obs_data_set_default_obj(obs_data_t data, const char *name,
 
 /*
  * Get functions
- * NOTE: use a macro if you use 'defaults' in more than one place
  */
 EXPORT const char *obs_data_getstring(obs_data_t data, const char *name);
 EXPORT long long obs_data_getint(obs_data_t data, const char *name);
@@ -110,6 +106,15 @@ EXPORT bool obs_data_getbool(obs_data_t data, const char *name);
 EXPORT obs_data_t obs_data_getobj(obs_data_t data, const char *name);
 EXPORT obs_data_array_t obs_data_getarray(obs_data_t data, const char *name);
 
+EXPORT const char *obs_data_get_default_string(obs_data_t data,
+		const char *name);
+EXPORT long long obs_data_get_default_int(obs_data_t data, const char *name);
+EXPORT double obs_data_get_default_double(obs_data_t data, const char *name);
+EXPORT bool obs_data_get_default_bool(obs_data_t data, const char *name);
+EXPORT obs_data_t obs_data_get_default_obj(obs_data_t data, const char *name);
+EXPORT obs_data_array_t obs_data_get_default_array(obs_data_t data,
+		const char *name);
+
 /* Array functions */
 EXPORT obs_data_array_t obs_data_array_create();
 EXPORT void obs_data_array_addref(obs_data_array_t array);
@@ -122,6 +127,24 @@ EXPORT void obs_data_array_insert(obs_data_array_t array, size_t idx,
 		obs_data_t obj);
 EXPORT void obs_data_array_erase(obs_data_array_t array, size_t idx);
 
+/* ------------------------------------------------------------------------- */
+/* Item status inspection */
+
+EXPORT bool obs_data_has_user_value(obs_data_t data, const char *name);
+EXPORT bool obs_data_has_default(obs_data_t data, const char *name);
+
+EXPORT bool obs_data_item_has_user_value(obs_data_item_t data);
+EXPORT bool obs_data_item_has_default(obs_data_item_t data);
+
+/* ------------------------------------------------------------------------- */
+/* Clearing data values */
+
+EXPORT void obs_data_unset_user_value(obs_data_t data, const char *name);
+EXPORT void obs_data_unset_default_value(obs_data_t data, const char *name);
+
+EXPORT void obs_data_item_unset_user_value(obs_data_item_t data);
+EXPORT void obs_data_item_unset_default_value(obs_data_item_t data);
+
 /* ------------------------------------------------------------------------- */
 /* Item iteration */
 
@@ -143,6 +166,16 @@ EXPORT void obs_data_item_setbool(obs_data_item_t *item, bool val);
 EXPORT void obs_data_item_setobj(obs_data_item_t *item, obs_data_t val);
 EXPORT void obs_data_item_setarray(obs_data_item_t *item, obs_data_array_t val);
 
+EXPORT void obs_data_item_set_default_string(obs_data_item_t *item,
+		const char *val);
+EXPORT void obs_data_item_set_default_int(obs_data_item_t *item, long long val);
+EXPORT void obs_data_item_set_default_double(obs_data_item_t *item, double val);
+EXPORT void obs_data_item_set_default_bool(obs_data_item_t *item, bool val);
+EXPORT void obs_data_item_set_default_obj(obs_data_item_t *item,
+		obs_data_t val);
+EXPORT void obs_data_item_set_default_array(obs_data_item_t *item,
+		obs_data_array_t val);
+
 /* Item get functions */
 EXPORT const char *obs_data_item_getstring(obs_data_item_t item);
 EXPORT long long obs_data_item_getint(obs_data_item_t item);
@@ -151,6 +184,13 @@ EXPORT bool obs_data_item_getbool(obs_data_item_t item);
 EXPORT obs_data_t obs_data_item_getobj(obs_data_item_t item);
 EXPORT obs_data_array_t obs_data_item_getarray(obs_data_item_t item);
 
+EXPORT const char *obs_data_item_get_default_string(obs_data_item_t item);
+EXPORT long long obs_data_item_get_default_int(obs_data_item_t item);
+EXPORT double obs_data_item_get_default_double(obs_data_item_t item);
+EXPORT bool obs_data_item_get_default_bool(obs_data_item_t item);
+EXPORT obs_data_t obs_data_item_get_default_obj(obs_data_item_t item);
+EXPORT obs_data_array_t obs_data_item_get_default_array(obs_data_item_t item);
+
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
 EXPORT void obs_data_set_vec2(obs_data_t data, const char *name,
@@ -180,6 +220,15 @@ EXPORT void obs_data_get_vec4(obs_data_t data, const char *name,
 EXPORT void obs_data_get_quat(obs_data_t data, const char *name,
 		struct quat *val);
 
+EXPORT void obs_data_get_default_vec2(obs_data_t data, const char *name,
+		struct vec2 *val);
+EXPORT void obs_data_get_default_vec3(obs_data_t data, const char *name,
+		struct vec3 *val);
+EXPORT void obs_data_get_default_vec4(obs_data_t data, const char *name,
+		struct vec4 *val);
+EXPORT void obs_data_get_default_quat(obs_data_t data, const char *name,
+		struct quat *val);
+
 /* ------------------------------------------------------------------------- */
 /* OBS-specific functions */
 

From c2bb95250bf647c8f89879bd1c0a749c6fe38ecf Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Mon, 16 Jun 2014 21:13:32 +0200
Subject: [PATCH 8/9] Add obs-data autoselect functions

These are meant to reflect auto-detection configuration changes that
should not be written to the config, for example, frame rate changes
for a camera where the (user-/config-file-)configured frame rate isn't
available but a similar frame rate can be automatically chosen
---
 libobs/obs-data.c | 339 ++++++++++++++++++++++++++++++++++++++++++++--
 libobs/obs-data.h |  68 ++++++++++
 2 files changed, 396 insertions(+), 11 deletions(-)

diff --git a/libobs/obs-data.c b/libobs/obs-data.c
index d4218dc42..f83fe879a 100644
--- a/libobs/obs-data.c
+++ b/libobs/obs-data.c
@@ -34,7 +34,9 @@ struct obs_data_item {
 	size_t               name_len;
 	size_t               data_len;
 	size_t               data_size;
+	size_t               default_len;
 	size_t               default_size;
+	size_t               autoselect_size;
 	size_t               capacity;
 };
 
@@ -91,7 +93,7 @@ static inline void *get_data_ptr(obs_data_item_t item)
 
 static inline void *get_item_data(struct obs_data_item *item)
 {
-	if (!item->data_size && !item->default_size)
+	if (!item->data_size && !item->default_size && !item->autoselect_size)
 		return NULL;
 	return get_data_ptr(item);
 }
@@ -106,10 +108,20 @@ static inline void *get_item_default_data(struct obs_data_item *item)
 	return item->default_size ? get_default_data_ptr(item) : NULL;
 }
 
+static inline void *get_autoselect_data_ptr(obs_data_item_t item)
+{
+	return (uint8_t*)get_default_data_ptr(item) + item->default_len;
+}
+
+static inline void *get_item_autoselect_data(struct obs_data_item *item)
+{
+	return item->autoselect_size ? get_autoselect_data_ptr(item) : NULL;
+}
+
 static inline size_t obs_data_item_total_size(struct obs_data_item *item)
 {
 	return sizeof(struct obs_data_item) + item->name_len +
-		item->data_len + item->default_size;
+		item->data_len + item->default_len + item->autoselect_size;
 }
 
 static inline obs_data_t get_item_obj(struct obs_data_item *item)
@@ -128,6 +140,14 @@ static inline obs_data_t get_item_default_obj(struct obs_data_item *item)
 	return *(obs_data_t*)get_item_data(item);
 }
 
+static inline obs_data_t get_item_autoselect_obj(struct obs_data_item *item)
+{
+	if (!item || !item->autoselect_size)
+		return NULL;
+
+	return *(obs_data_t*)get_item_data(item);
+}
+
 static inline obs_data_array_t get_item_array(struct obs_data_item *item)
 {
 	if (!item)
@@ -145,6 +165,15 @@ static inline obs_data_array_t get_item_default_array(
 	return *(obs_data_array_t*)get_item_data(item);
 }
 
+static inline obs_data_array_t get_item_autoselect_array(
+		struct obs_data_item *item)
+{
+	if (!item || !item->autoselect_size)
+		return NULL;
+
+	return *(obs_data_array_t*)get_item_data(item);
+}
+
 static inline void item_data_release(struct obs_data_item *item)
 {
 	if (!obs_data_item_has_user_value(item))
@@ -172,6 +201,18 @@ static inline void item_default_data_release(struct obs_data_item *item)
 	}
 }
 
+static inline void item_autoselect_data_release(struct obs_data_item *item)
+{
+	if (item->type == OBS_DATA_OBJECT) {
+		obs_data_t obj = get_item_autoselect_obj(item);
+		obs_data_release(obj);
+
+	} else if (item->type == OBS_DATA_ARRAY) {
+		obs_data_array_t array = get_item_autoselect_array(item);
+		obs_data_array_release(array);
+	}
+}
+
 static inline void item_data_addref(struct obs_data_item *item)
 {
 	if (item->type == OBS_DATA_OBJECT) {
@@ -199,9 +240,21 @@ static inline void item_default_data_addref(struct obs_data_item *item)
 	}
 }
 
+static inline void item_autoselect_data_addref(struct obs_data_item *item)
+{
+	if (item->type == OBS_DATA_OBJECT) {
+		obs_data_t obj = get_item_autoselect_obj(item);
+		obs_data_addref(obj);
+
+	} else if (item->type == OBS_DATA_ARRAY) {
+		obs_data_array_t array = get_item_autoselect_array(item);
+		obs_data_array_addref(array);
+	}
+}
+
 static struct obs_data_item *obs_data_item_create(const char *name,
 		const void *data, size_t size, enum obs_data_type type,
-		bool default_data)
+		bool default_data, bool autoselect_data)
 {
 	struct obs_data_item *item;
 	size_t name_size, total_size;
@@ -220,8 +273,12 @@ static struct obs_data_item *obs_data_item_create(const char *name,
 	item->ref      = 1;
 
 	if (default_data) {
+		item->default_len = size;
 		item->default_size = size;
 
+	} else if (autoselect_data) {
+		item->autoselect_size = size;
+
 	} else {
 		item->data_len = size;
 		item->data_size = size;
@@ -295,6 +352,7 @@ static inline void obs_data_item_destroy(struct obs_data_item *item)
 {
 	item_data_release(item);
 	item_default_data_release(item);
+	item_autoselect_data_release(item);
 	obs_data_item_detach(item);
 	bfree(item);
 }
@@ -324,11 +382,11 @@ static inline void obs_data_item_setdata(
 
 	item->data_size = size;
 	item->type      = type;
-	item->data_len  = item->default_size ? 
+	item->data_len  = (item->default_size || item->autoselect_size) ? 
 		get_align_size(size) : size;
 	item = obs_data_item_ensure_capacity(item);
 
-	if (item->default_size)
+	if (item->default_size || item->autoselect_size)
 		move_data(*p_item, old_non_user_data, item,
 				get_default_data_ptr(item),
 				item->default_len + item->autoselect_size);
@@ -349,14 +407,22 @@ static inline void obs_data_item_set_default_data(
 		return;
 
 	struct obs_data_item *item = *p_item;
+	void *old_autoselect_data = get_autoselect_data_ptr(item);
 	item_default_data_release(item);
 
 	item->type         = type;
 	item->default_size = size;
+	item->default_len  = item->autoselect_size ?
+				get_align_size(size) : size;
 	item->data_len     = item->data_size ?
 				get_align_size(item->data_size) : 0;
 	item = obs_data_item_ensure_capacity(item);
 
+	if (item->autoselect_size)
+		move_data(*p_item, old_autoselect_data, item,
+				get_autoselect_data_ptr(item),
+				item->autoselect_size);
+
 	if (size) {
 		memcpy(get_item_default_data(item), data, size);
 		item_default_data_addref(item);
@@ -365,6 +431,32 @@ static inline void obs_data_item_set_default_data(
 	*p_item = item;
 }
 
+static inline void obs_data_item_set_autoselect_data(
+		struct obs_data_item **p_item, const void *data, size_t size,
+		enum obs_data_type type)
+{
+	if (!p_item || !*p_item)
+		return;
+
+	struct obs_data_item *item = *p_item;
+	item_autoselect_data_release(item);
+
+	item->autoselect_size = size;
+	item->type            = type;
+	item->data_len        = item->data_size ?
+					get_align_size(item->data_size) : 0;
+	item->default_len     = item->default_size ?
+					get_align_size(item->default_size) : 0;
+	item = obs_data_item_ensure_capacity(item);
+
+	if (size) {
+		memcpy(get_item_autoselect_data(item), data, size);
+		item_autoselect_data_addref(item);
+	}
+
+	*p_item = item;
+}
+
 /* ------------------------------------------------------------------------- */
 
 static void obs_data_add_json_item(obs_data_t data, const char *key,
@@ -609,13 +701,13 @@ static struct obs_data_item *get_item(struct obs_data *data, const char *name)
 static void set_item_data(struct obs_data *data, struct obs_data_item **item,
 		const char *name, const void *ptr, size_t size,
 		enum obs_data_type type,
-		bool default_data)
+		bool default_data, bool autoselect_data)
 {
 	obs_data_item_t new_item = NULL;
 
 	if ((!item || (item && !*item)) && data) {
 		new_item = obs_data_item_create(name, ptr, size, type,
-				default_data);
+				default_data, autoselect_data);
 		new_item->next = data->first_item;
 		new_item->parent = data;
 
@@ -623,6 +715,8 @@ static void set_item_data(struct obs_data *data, struct obs_data_item **item,
 
 	} else if (default_data) {
 		obs_data_item_set_default_data(item, ptr, size, type);
+	} else if (autoselect_data) {
+		obs_data_item_set_autoselect_data(item, ptr, size, type);
 	} else {
 		obs_data_item_setdata(item, ptr, size, type);
 	}
@@ -642,7 +736,7 @@ static inline void set_item(struct obs_data *data, obs_data_item_t *item,
 		item = &actual_item;
 	}
 
-	set_item_data(data, item, name, ptr, size, type, false);
+	set_item_data(data, item, name, ptr, size, type, false, false);
 }
 
 static inline void set_item_def(struct obs_data *data, obs_data_item_t *item,
@@ -662,7 +756,24 @@ static inline void set_item_def(struct obs_data *data, obs_data_item_t *item,
 	if (item && *item && (*item)->type == type)
 		return;
 
-	set_item_data(data, item, name, ptr, size, type, true);
+	set_item_data(data, item, name, ptr, size, type, true, false);
+}
+
+static inline void set_item_auto(struct obs_data *data, obs_data_item_t *item,
+		const char *name,
+		const void *ptr, size_t size, enum obs_data_type type)
+{
+	obs_data_item_t actual_item = NULL;
+
+	if (!data && !item)
+		return;
+
+	if (!item) {
+		actual_item = get_item(data, name);
+		item = &actual_item;
+	}
+
+	set_item_data(data, item, name, ptr, size, type, false, true);
 }
 
 static inline void copy_item(struct obs_data *data, struct obs_data_item *item)
@@ -809,6 +920,41 @@ void obs_data_set_default_obj(obs_data_t data, const char *name, obs_data_t obj)
 	obs_set_obj(data, NULL, name, obj, set_item_def);
 }
 
+void obs_data_set_autoselect_string(obs_data_t data, const char *name,
+		const char *val)
+{
+	obs_set_string(data, NULL, name, val, set_item_auto);
+}
+
+void obs_data_set_autoselect_int(obs_data_t data, const char *name,
+		long long val)
+{
+	obs_set_int(data, NULL, name, val, set_item_auto);
+}
+
+void obs_data_set_autoselect_double(obs_data_t data, const char *name,
+		double val)
+{
+	obs_set_double(data, NULL, name, val, set_item_auto);
+}
+
+void obs_data_set_autoselect_bool(obs_data_t data, const char *name, bool val)
+{
+	obs_set_bool(data, NULL, name, val, set_item_auto);
+}
+
+void obs_data_set_autoselect_obj(obs_data_t data, const char *name,
+		obs_data_t obj)
+{
+	obs_set_obj(data, NULL, name, obj, set_item_auto);
+}
+
+void obs_data_set_autoselect_array(obs_data_t data, const char *name,
+		obs_data_array_t arr)
+{
+	obs_set_array(data, NULL, name, arr, set_item_auto);
+}
+
 const char *obs_data_getstring(obs_data_t data, const char *name)
 {
 	return obs_data_item_getstring(get_item(data, name));
@@ -869,6 +1015,37 @@ obs_data_array_t obs_data_get_default_array(obs_data_t data, const char *name)
 	return obs_data_item_get_default_array(get_item(data, name));
 }
 
+const char *obs_data_get_autoselect_string(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_autoselect_string(get_item(data, name));
+}
+
+long long obs_data_get_autoselect_int(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_autoselect_int(get_item(data, name));
+}
+
+double obs_data_get_autoselect_double(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_autoselect_double(get_item(data, name));
+}
+
+bool obs_data_getautoselect_bool(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_autoselect_bool(get_item(data, name));
+}
+
+obs_data_t obs_data_get_autoselect_obj(obs_data_t data, const char *name)
+{
+	return obs_data_item_get_autoselect_obj(get_item(data, name));
+}
+
+obs_data_array_t obs_data_get_autoselect_array(obs_data_t data,
+		const char *name)
+{
+	return obs_data_item_get_autoselect_array(get_item(data, name));
+}
+
 obs_data_array_t obs_data_array_create()
 {
 	struct obs_data_array *array = bzalloc(sizeof(struct obs_data_array));
@@ -960,6 +1137,11 @@ bool obs_data_has_default(obs_data_t data, const char *name)
 	return data && obs_data_item_has_default(get_item(data, name));
 }
 
+bool obs_data_has_autoselect(obs_data_t data, const char *name)
+{
+	return data && obs_data_item_has_autoselect(get_item(data, name));
+}
+
 bool obs_data_item_has_user_value(obs_data_item_t item)
 {
 	return item && item->data_size;
@@ -970,6 +1152,11 @@ bool obs_data_item_has_default(obs_data_item_t item)
 	return item && item->default_size;
 }
 
+bool obs_data_item_has_autoselect(obs_data_item_t item)
+{
+	return item && item->autoselect_size;
+}
+
 /* ------------------------------------------------------------------------- */
 /* Clearing data values */
 
@@ -983,6 +1170,11 @@ void obs_data_unset_default_value(obs_data_t data, const char *name)
 	obs_data_item_unset_default_value(get_item(data, name));
 }
 
+void obs_data_unset_autoselect_value(obs_data_t data, const char *name)
+{
+	obs_data_item_unset_autoselect_value(get_item(data, name));
+}
+
 void obs_data_item_unset_user_value(obs_data_item_t item)
 {
 	if (!item || !item->data_size)
@@ -994,10 +1186,10 @@ void obs_data_item_unset_user_value(obs_data_item_t item)
 	item->data_size = 0;
 	item->data_len = 0;
 
-	if (item->default_size)
+	if (item->default_size || item->autoselect_size)
 		move_data(item, old_non_user_data, item,
 				get_default_data_ptr(item),
-				item->default_len);
+				item->default_len + item->autoselect_size);
 }
 
 void obs_data_item_unset_default_value(obs_data_item_t item)
@@ -1005,9 +1197,25 @@ void obs_data_item_unset_default_value(obs_data_item_t item)
 	if (!item || !item->default_size)
 		return;
 
+	void *old_autoselect_data = get_autoselect_data_ptr(item);
+
 	item_default_data_release(item);
 	item->default_size = 0;
+	item->default_len = 0;
 
+	if (item->autoselect_size)
+		move_data(item, old_autoselect_data, item,
+				get_autoselect_data_ptr(item),
+				item->autoselect_size);
+}
+
+void obs_data_item_unset_autoselect_value(obs_data_item_t item)
+{
+	if (!item || !item->autoselect_size)
+		return;
+
+	item_autoselect_data_release(item);
+	item->autoselect_size = 0;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1147,6 +1355,37 @@ void obs_data_item_set_default_array(obs_data_item_t *item,
 	obs_set_array(NULL, item, NULL, val, set_item_def);
 }
 
+void obs_data_item_set_autoselect_string(obs_data_item_t *item, const char *val)
+{
+	obs_set_string(NULL, item, NULL, val, set_item_auto);
+}
+
+void obs_data_item_set_autoselect_int(obs_data_item_t *item, long long val)
+{
+	obs_set_int(NULL, item, NULL, val, set_item_auto);
+}
+
+void obs_data_item_set_autoselect_double(obs_data_item_t *item, double val)
+{
+	obs_set_double(NULL, item, NULL, val, set_item_auto);
+}
+
+void obs_data_item_set_autoselect_bool(obs_data_item_t *item, bool val)
+{
+	obs_set_bool(NULL, item, NULL, val, set_item_auto);
+}
+
+void obs_data_item_set_autoselect_obj(obs_data_item_t *item, obs_data_t val)
+{
+	obs_set_obj(NULL, item, NULL, val, set_item_auto);
+}
+
+void obs_data_item_set_autoselect_array(obs_data_item_t *item,
+		obs_data_array_t val)
+{
+	obs_set_array(NULL, item, NULL, val, set_item_auto);
+}
+
 static inline bool item_valid(struct obs_data_item *item,
 		enum obs_data_type type)
 {
@@ -1292,6 +1531,36 @@ obs_data_array_t obs_data_item_get_default_array(obs_data_item_t item)
 	return data_item_get_array(item, get_item_array);
 }
 
+const char *obs_data_item_get_autoselect_string(obs_data_item_t item)
+{
+	return data_item_get_string(item, get_item_autoselect_data);
+}
+
+long long obs_data_item_get_autoselect_int(obs_data_item_t item)
+{
+	return data_item_get_int(item, get_item_autoselect_data);
+}
+
+double obs_data_item_get_autoselect_double(obs_data_item_t item)
+{
+	return data_item_get_double(item, get_item_autoselect_data);
+}
+
+bool obs_data_item_get_autoselect_bool(obs_data_item_t item)
+{
+	return data_item_get_bool(item, get_item_autoselect_data);
+}
+
+obs_data_t obs_data_item_get_autoselect_obj(obs_data_item_t item)
+{
+	return data_item_get_obj(item, get_item_autoselect_obj);
+}
+
+obs_data_array_t obs_data_item_get_autoselect_array(obs_data_item_t item)
+{
+	return data_item_get_array(item, get_item_autoselect_array);
+}
+
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
 
@@ -1390,6 +1659,30 @@ void obs_data_set_default_quat(obs_data_t data, const char *name,
 	set_quat(data, name, val, obs_data_set_default_obj);
 }
 
+void obs_data_set_autoselect_vec2(obs_data_t data, const char *name,
+		const struct vec2 *val)
+{
+	set_vec2(data, name, val, obs_data_set_autoselect_obj);
+}
+
+void obs_data_set_autoselect_vec3(obs_data_t data, const char *name,
+		const struct vec3 *val)
+{
+	set_vec3(data, name, val, obs_data_set_autoselect_obj);
+}
+
+void obs_data_set_autoselect_vec4(obs_data_t data, const char *name,
+		const struct vec4 *val)
+{
+	set_vec4(data, name, val, obs_data_set_autoselect_obj);
+}
+
+void obs_data_set_autoselect_quat(obs_data_t data, const char *name,
+		const struct quat *val)
+{
+	set_quat(data, name, val, obs_data_set_autoselect_obj);
+}
+
 static inline void get_vec2(obs_data_t obj, struct vec2 *val)
 {
 	if (!obj) return;
@@ -1474,3 +1767,27 @@ void obs_data_get_default_quat(obs_data_t data, const char *name,
 {
 	get_quat(obs_data_get_default_obj(data, name), val);
 }
+
+void obs_data_get_autoselect_vec2(obs_data_t data, const char *name,
+		struct vec2 *val)
+{
+	get_vec2(obs_data_get_autoselect_obj(data, name), val);
+}
+
+void obs_data_get_autoselect_vec3(obs_data_t data, const char *name,
+		struct vec3 *val)
+{
+	get_vec3(obs_data_get_autoselect_obj(data, name), val);
+}
+
+void obs_data_get_autoselect_vec4(obs_data_t data, const char *name,
+		struct vec4 *val)
+{
+	get_vec4(obs_data_get_autoselect_obj(data, name), val);
+}
+
+void obs_data_get_autoselect_quat(obs_data_t data, const char *name,
+		struct quat *val)
+{
+	get_quat(obs_data_get_autoselect_obj(data, name), val);
+}
diff --git a/libobs/obs-data.h b/libobs/obs-data.h
index 0e48f6616..5bb27f425 100644
--- a/libobs/obs-data.h
+++ b/libobs/obs-data.h
@@ -96,6 +96,22 @@ EXPORT void obs_data_set_default_bool(obs_data_t data, const char *name,
 EXPORT void obs_data_set_default_obj(obs_data_t data, const char *name,
 		obs_data_t obj);
 
+/*
+ * Application overrides
+ * Use these to communicate the actual values of settings in case the user
+ * settings aren't appropriate
+ */
+EXPORT void obs_data_set_autoselect_string(obs_data_t data, const char *name,
+		const char *val);
+EXPORT void obs_data_set_autoselect_int(obs_data_t data, const char *name,
+		long long val);
+EXPORT void obs_data_set_autoselect_double(obs_data_t data, const char *name,
+		double val);
+EXPORT void obs_data_set_autoselect_bool(obs_data_t data, const char *name,
+		bool val);
+EXPORT void obs_data_set_autoselect_obj(obs_data_t data, const char *name,
+		obs_data_t obj);
+
 /*
  * Get functions
  */
@@ -115,6 +131,16 @@ EXPORT obs_data_t obs_data_get_default_obj(obs_data_t data, const char *name);
 EXPORT obs_data_array_t obs_data_get_default_array(obs_data_t data,
 		const char *name);
 
+EXPORT const char *obs_data_get_autoselect_string(obs_data_t data,
+		const char *name);
+EXPORT long long obs_data_get_autoselect_int(obs_data_t data, const char *name);
+EXPORT double obs_data_get_autoselect_double(obs_data_t data, const char *name);
+EXPORT bool obs_data_get_autoselect_bool(obs_data_t data, const char *name);
+EXPORT obs_data_t obs_data_get_autoselect_obj(obs_data_t data,
+		const char *name);
+EXPORT obs_data_array_t obs_data_get_autoselect_array(obs_data_t data,
+		const char *name);
+
 /* Array functions */
 EXPORT obs_data_array_t obs_data_array_create();
 EXPORT void obs_data_array_addref(obs_data_array_t array);
@@ -132,18 +158,22 @@ EXPORT void obs_data_array_erase(obs_data_array_t array, size_t idx);
 
 EXPORT bool obs_data_has_user_value(obs_data_t data, const char *name);
 EXPORT bool obs_data_has_default(obs_data_t data, const char *name);
+EXPORT bool obs_data_has_autoselect(obs_data_t data, const char *name);
 
 EXPORT bool obs_data_item_has_user_value(obs_data_item_t data);
 EXPORT bool obs_data_item_has_default(obs_data_item_t data);
+EXPORT bool obs_data_item_has_autoselect(obs_data_item_t data);
 
 /* ------------------------------------------------------------------------- */
 /* Clearing data values */
 
 EXPORT void obs_data_unset_user_value(obs_data_t data, const char *name);
 EXPORT void obs_data_unset_default_value(obs_data_t data, const char *name);
+EXPORT void obs_data_unset_autoselect_value(obs_data_t data, const char *name);
 
 EXPORT void obs_data_item_unset_user_value(obs_data_item_t data);
 EXPORT void obs_data_item_unset_default_value(obs_data_item_t data);
+EXPORT void obs_data_item_unset_autoselect_value(obs_data_item_t data);
 
 /* ------------------------------------------------------------------------- */
 /* Item iteration */
@@ -176,6 +206,18 @@ EXPORT void obs_data_item_set_default_obj(obs_data_item_t *item,
 EXPORT void obs_data_item_set_default_array(obs_data_item_t *item,
 		obs_data_array_t val);
 
+EXPORT void obs_data_item_set_autoselect_string(obs_data_item_t *item,
+		const char *val);
+EXPORT void obs_data_item_set_autoselect_int(obs_data_item_t *item,
+		long long val);
+EXPORT void obs_data_item_set_autoselect_double(obs_data_item_t *item,
+		double val);
+EXPORT void obs_data_item_set_autoselect_bool(obs_data_item_t *item, bool val);
+EXPORT void obs_data_item_set_autoselect_obj(obs_data_item_t *item,
+		obs_data_t val);
+EXPORT void obs_data_item_set_autoselect_array(obs_data_item_t *item,
+		obs_data_array_t val);
+
 /* Item get functions */
 EXPORT const char *obs_data_item_getstring(obs_data_item_t item);
 EXPORT long long obs_data_item_getint(obs_data_item_t item);
@@ -191,6 +233,14 @@ EXPORT bool obs_data_item_get_default_bool(obs_data_item_t item);
 EXPORT obs_data_t obs_data_item_get_default_obj(obs_data_item_t item);
 EXPORT obs_data_array_t obs_data_item_get_default_array(obs_data_item_t item);
 
+EXPORT const char *obs_data_item_get_autoselect_string(obs_data_item_t item);
+EXPORT long long obs_data_item_get_autoselect_int(obs_data_item_t item);
+EXPORT double obs_data_item_get_autoselect_double(obs_data_item_t item);
+EXPORT bool obs_data_item_get_autoselect_bool(obs_data_item_t item);
+EXPORT obs_data_t obs_data_item_get_autoselect_obj(obs_data_item_t item);
+EXPORT obs_data_array_t obs_data_item_get_autoselect_array(
+		obs_data_item_t item);
+
 /* ------------------------------------------------------------------------- */
 /* Helper functions for certain structures */
 EXPORT void obs_data_set_vec2(obs_data_t data, const char *name,
@@ -211,6 +261,15 @@ EXPORT void obs_data_set_default_vec4(obs_data_t data, const char *name,
 EXPORT void obs_data_set_default_quat(obs_data_t data, const char *name,
 		const struct quat *val);
 
+EXPORT void obs_data_set_autoselect_vec2(obs_data_t data, const char *name,
+		const struct vec2 *val);
+EXPORT void obs_data_set_autoselect_vec3(obs_data_t data, const char *name,
+		const struct vec3 *val);
+EXPORT void obs_data_set_autoselect_vec4(obs_data_t data, const char *name,
+		const struct vec4 *val);
+EXPORT void obs_data_set_autoselect_quat(obs_data_t data, const char *name,
+		const struct quat *val);
+
 EXPORT void obs_data_get_vec2(obs_data_t data, const char *name,
 		struct vec2 *val);
 EXPORT void obs_data_get_vec3(obs_data_t data, const char *name,
@@ -229,6 +288,15 @@ EXPORT void obs_data_get_default_vec4(obs_data_t data, const char *name,
 EXPORT void obs_data_get_default_quat(obs_data_t data, const char *name,
 		struct quat *val);
 
+EXPORT void obs_data_get_autoselect_vec2(obs_data_t data, const char *name,
+		struct vec2 *val);
+EXPORT void obs_data_get_autoselect_vec3(obs_data_t data, const char *name,
+		struct vec3 *val);
+EXPORT void obs_data_get_autoselect_vec4(obs_data_t data, const char *name,
+		struct vec4 *val);
+EXPORT void obs_data_get_autoselect_quat(obs_data_t data, const char *name,
+		struct quat *val);
+
 /* ------------------------------------------------------------------------- */
 /* OBS-specific functions */
 

From dfc8f517855cf486644b95c0fce720f58d597e61 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Sun, 15 Jun 2014 07:05:50 +0200
Subject: [PATCH 9/9] Make properties-view reflect autoselect settings (for
 property lists)

---
 build/data/obs-studio/locale/en.txt |  3 ++
 obs/properties-view.cpp             | 73 ++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/build/data/obs-studio/locale/en.txt b/build/data/obs-studio/locale/en.txt
index cf981b9b4..fb1d3d05f 100644
--- a/build/data/obs-studio/locale/en.txt
+++ b/build/data/obs-studio/locale/en.txt
@@ -66,6 +66,9 @@ Basic.Main.DefaultSceneName.Text="Scene %1"
 Basic.SourceSelect.CreateNew="Create new"
 Basic.SourceSelect.AddExisting="Add Existing"
 
+# properties window
+Basic.PropertiesWindow.AutoSelectFormat="%1 (unsupported; autoselect: %2)"
+
 # transform window
 Basic.TransformWindow="Scene Item Transform"
 Basic.TransformWindow.Position="Position"
diff --git a/obs/properties-view.cpp b/obs/properties-view.cpp
index 39cb8e3d3..cc7d540fd 100644
--- a/obs/properties-view.cpp
+++ b/obs/properties-view.cpp
@@ -9,6 +9,7 @@
 #include <QStandardItem>
 #include "qt-wrappers.hpp"
 #include "properties-view.hpp"
+#include "obs-app.hpp"
 #include <string>
 
 using namespace std;
@@ -172,6 +173,39 @@ static void AddComboItem(QComboBox *combo, obs_property_t prop,
 	item->setFlags(Qt::NoItemFlags);
 }
 
+template <long long get_int(obs_data_t, const char*),
+	 double get_double(obs_data_t, const char*),
+	 const char *get_string(obs_data_t, const char*)>
+static string from_obs_data(obs_data_t data, const char *name,
+		obs_combo_format format)
+{
+	switch (format) {
+	case OBS_COMBO_FORMAT_INT:
+		return to_string(get_int(data, name));
+	case OBS_COMBO_FORMAT_FLOAT:
+		return to_string(get_double(data, name));
+	case OBS_COMBO_FORMAT_STRING:
+		return get_string(data, name);
+	default:
+		return "";
+	}
+}
+
+static string from_obs_data(obs_data_t data, const char *name,
+		obs_combo_format format)
+{
+	return from_obs_data<obs_data_getint, obs_data_getdouble,
+	       obs_data_getstring>(data, name, format);
+}
+
+static string from_obs_data_autoselect(obs_data_t data, const char *name,
+		obs_combo_format format)
+{
+	return from_obs_data<obs_data_get_autoselect_int,
+	       obs_data_get_autoselect_double,
+	       obs_data_get_autoselect_string>(data, name, format);
+}
+
 QWidget *OBSPropertiesView::AddList(obs_property_t prop, bool &warning)
 {
 	const char       *name  = obs_property_name(prop);
@@ -187,24 +221,13 @@ QWidget *OBSPropertiesView::AddList(obs_property_t prop, bool &warning)
 	if (type == OBS_COMBO_TYPE_EDITABLE)
 		combo->setEditable(true);
 
-	if (format == OBS_COMBO_FORMAT_INT) {
-		int    val       = (int)obs_data_getint(settings, name);
-		string valString = to_string(val);
-		idx              = combo->findData(QT_UTF8(valString.c_str()));
+	string value = from_obs_data(settings, name, format);
 
-	} else if (format == OBS_COMBO_FORMAT_FLOAT) {
-		double val       = obs_data_getdouble(settings, name);
-		string valString = to_string(val);
-		idx              = combo->findData(QT_UTF8(valString.c_str()));
-
-	} else if (format == OBS_COMBO_FORMAT_STRING) {
-		const char *val  = obs_data_getstring(settings, name);
-
-		if (type == OBS_COMBO_TYPE_EDITABLE)
-			combo->lineEdit()->setText(val);
-		else
-			idx      = combo->findData(QT_UTF8(val));
-	}
+	if (format == OBS_COMBO_FORMAT_STRING &&
+			type == OBS_COMBO_TYPE_EDITABLE)
+		combo->lineEdit()->setText(QT_UTF8(value.c_str()));
+	else
+		idx = combo->findData(QT_UTF8(value.c_str()));
 
 	if (type == OBS_COMBO_TYPE_EDITABLE)
 		return NewWidget(prop, combo,
@@ -212,6 +235,22 @@ QWidget *OBSPropertiesView::AddList(obs_property_t prop, bool &warning)
 
 	if (idx != -1)
 		combo->setCurrentIndex(idx);
+	
+	if (obs_data_has_autoselect(settings, name)) {
+		string autoselect =
+			from_obs_data_autoselect(settings, name, format);
+		int id = combo->findData(QT_UTF8(autoselect.c_str()));
+
+		if (id != -1 && id != idx) {
+			QString actual   = combo->itemText(id);
+			QString selected = combo->itemText(idx);
+			QString combined = QTStr(
+				"Basic.PropertiesWindow.AutoSelectFormat");
+			combo->setItemText(idx,
+					combined.arg(selected).arg(actual));
+		}
+	}
+
 
 	QAbstractItemModel *model = combo->model();
 	warning = idx != -1 &&