X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fvalues.c;h=5800a008e44a96f73c04c476224a0025937f71b2;hb=541a1a480c131997178d482d7eb0b1f7f33d90ba;hp=4f6c407697075ebab8b449b2495d19c4c8d065ba;hpb=e3ed1af85d617724db9df501b44da9dae59e33c4;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/values.c b/gtk/src/values.c
index 4f6c4076..5800a008 100644
--- a/gtk/src/values.c
+++ b/gtk/src/values.c
@@ -15,6 +15,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <string.h>
+#include <inttypes.h>
 #include "values.h"
 
 static void dict_delete_key(gpointer data);
@@ -45,7 +46,7 @@ ghb_value_dup(const GValue *val)
 	return copy;
 }
 
-static void
+void
 debug_show_type(GType tp)
 {
 	const gchar *str = "unknown";
@@ -61,6 +62,10 @@ debug_show_type(GType tp)
 	{
 		str ="int64";
 	}
+	else if (tp == G_TYPE_DOUBLE)
+	{
+		str ="double";
+	}
 	else if (tp == G_TYPE_BOOLEAN)
 	{
 		str ="bool";
@@ -73,7 +78,43 @@ debug_show_type(GType tp)
 	{
 		str ="dict";
 	}
-	g_debug("%s", str);
+	g_debug("Type %s", str);
+}
+
+void
+debug_show_value(GValue *gval)
+{
+	GType tp;
+
+	tp = G_VALUE_TYPE(gval);
+	if (tp == G_TYPE_STRING)
+	{
+		g_message("Type %s value %s", "string", g_value_get_string(gval));
+	}
+	else if (tp == G_TYPE_INT)
+	{
+		g_message("Type %s value %d", "int", g_value_get_int(gval));
+	}
+	else if (tp == G_TYPE_INT64)
+	{
+		g_message("Type %s value %" PRId64, "int64", g_value_get_int64(gval));
+	}
+	else if (tp == G_TYPE_DOUBLE)
+	{
+		g_message("Type %s value %f", "double", g_value_get_double(gval));
+	}
+	else if (tp == G_TYPE_BOOLEAN)
+	{
+		g_message("Type %s value %d", "boolean", g_value_get_boolean(gval));
+	}
+	else if (tp == ghb_array_get_type())
+	{
+		g_message("Type %s", "boolean");
+	}
+	else if (tp == ghb_dict_get_type())
+	{
+		g_message("Type %s", "dict");
+	}
 }
 
 gint
@@ -83,21 +124,21 @@ ghb_value_int(const GValue *val)
 
 	if (val == NULL) return 0;
 	GValue xform = {0,};
-	if (G_VALUE_TYPE(val) != G_TYPE_INT64)
+	if (G_VALUE_TYPE(val) != G_TYPE_INT)
 	{
-		g_value_init(&xform, G_TYPE_INT64);
+		g_value_init(&xform, G_TYPE_INT);
 		if (!g_value_transform(val, &xform))
 		{
 			debug_show_type(G_VALUE_TYPE(val));
 			g_warning("int can't transform");
 			return 0;
 		}
-		result = (gint)g_value_get_int64(&xform);
+		result = g_value_get_int(&xform);
 		g_value_unset(&xform);
 	}
 	else
 	{
-		result = (gint)g_value_get_int64(val);
+		result = g_value_get_int(val);
 	}
 	return result;
 }
@@ -212,6 +253,10 @@ ghb_value_cmp(const GValue *vala, const GValue *valb)
 	GType typa;
 	GType typb;
 
+	if ((vala == NULL && valb != NULL) || (vala != NULL && valb == NULL))
+	{
+		return 1;
+	}
 	typa = G_VALUE_TYPE(vala);
 	typb = G_VALUE_TYPE(valb);
 	if (typa != typb)
@@ -529,7 +574,7 @@ ghb_dict_iter_init(GHashTableIter *iter, GValue *gval)
 }
 
 GValue*
-ghb_dict_lookup(GValue *gval, const gchar *key)
+ghb_dict_lookup(const GValue *gval, const gchar *key)
 {
 	GHashTable *dict = g_value_get_boxed(gval);
 	return g_hash_table_lookup(dict, key);
@@ -652,6 +697,22 @@ ghb_array_replace(GValue *gval, guint ii, GValue *val)
 	((GValue**)arr->data)[ii] = val;
 }
 
+void
+ghb_array_copy(GValue *arr1, GValue *arr2, gint count)
+{
+	gint len, ii;
+
+	// empty the first array if it is not already empty
+	len = ghb_array_len(arr1);
+	for (ii = 0; ii < len; ii++)
+		ghb_array_remove(arr1, 0);
+
+	len = ghb_array_len(arr2);
+	count = MIN(count, len);
+	for (ii = 0; ii < count; ii++)
+		ghb_array_append(arr1, ghb_value_dup(ghb_array_get_nth(arr2, ii)));
+}
+
 gint
 ghb_array_len(const GValue *gval)
 {
@@ -663,16 +724,23 @@ ghb_array_len(const GValue *gval)
 static void
 xform_string_int(const GValue *sval, GValue *ival)
 {
+	gchar *end;
+
 	const gchar *str = g_value_get_string(sval);
-	gint val = g_strtod(str, NULL);
+	gint val = g_strtod(str, &end);
+	if (*end)
+		val = (guint)(~0)>>1;
 	g_value_set_int(ival, val);
 }
 
 static void
 xform_string_int64(const GValue *sval, GValue *ival)
 {
+	gchar *end;
 	const gchar *str = g_value_get_string(sval);
-	gint64 val = g_strtod(str, NULL);
+	gint64 val = g_strtod(str, &end);
+	if (*end)
+		val = (guint64)(~0L)>>1;
 	g_value_set_int64(ival, val);
 }
 
@@ -685,6 +753,15 @@ xform_string_double(const GValue *sval, GValue *dval)
 }
 
 static void
+xform_double_string(const GValue *dval, GValue *sval)
+{
+	gchar *str;
+	double val = g_value_get_double(dval);
+	str = g_strdup_printf("%g", val);
+	g_value_take_string(sval, str);
+}
+
+static void
 xform_boolean_double(const GValue *bval, GValue *dval)
 {
 	gboolean b = g_value_get_boolean(bval);
@@ -703,4 +780,6 @@ ghb_register_transforms()
 								xform_string_double);
 	g_value_register_transform_func(G_TYPE_BOOLEAN, G_TYPE_DOUBLE, 
 								xform_boolean_double);
+	g_value_register_transform_func(G_TYPE_DOUBLE, G_TYPE_STRING, 
+								xform_double_string);
 }