X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.c;h=cc9ae4bc8830184335a24f00bff5dbb94cdcad03;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=36f4d58a165ed45126b6e16c4f117700e32af547;hpb=e205b3e8ebcb560af77303c9c23957793e60ff20;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 36f4d58a..cc9ae4bc 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -98,7 +98,7 @@ ghb_settings_set_boolean(GValue *settings, const gchar *key, gboolean bval)
 }
 
 GValue*
-ghb_settings_get_value(GValue *settings, const gchar *key)
+ghb_settings_get_value(const GValue *settings, const gchar *key)
 {
 	GValue *value;
 	value = ghb_dict_lookup(settings, key);
@@ -108,7 +108,7 @@ ghb_settings_get_value(GValue *settings, const gchar *key)
 }
 
 gboolean
-ghb_settings_get_boolean(GValue *settings, const gchar *key)
+ghb_settings_get_boolean(const GValue *settings, const gchar *key)
 {
 	const GValue* value;
 	value = ghb_settings_get_value(settings, key);
@@ -117,7 +117,7 @@ ghb_settings_get_boolean(GValue *settings, const gchar *key)
 }
 
 gint64
-ghb_settings_get_int64(GValue *settings, const gchar *key)
+ghb_settings_get_int64(const GValue *settings, const gchar *key)
 {
 	const GValue* value;
 	value = ghb_settings_get_value(settings, key);
@@ -126,7 +126,7 @@ ghb_settings_get_int64(GValue *settings, const gchar *key)
 }
 
 gint
-ghb_settings_get_int(GValue *settings, const gchar *key)
+ghb_settings_get_int(const GValue *settings, const gchar *key)
 {
 	const GValue* value;
 	value = ghb_settings_get_value(settings, key);
@@ -135,7 +135,7 @@ ghb_settings_get_int(GValue *settings, const gchar *key)
 }
 
 gdouble
-ghb_settings_get_double(GValue *settings, const gchar *key)
+ghb_settings_get_double(const GValue *settings, const gchar *key)
 {
 	const GValue* value;
 	value = ghb_settings_get_value(settings, key);
@@ -144,7 +144,7 @@ ghb_settings_get_double(GValue *settings, const gchar *key)
 }
 
 gchar*
-ghb_settings_get_string(GValue *settings, const gchar *key)
+ghb_settings_get_string(const GValue *settings, const gchar *key)
 {
 	const GValue* value;
 	value = ghb_settings_get_value(settings, key);
@@ -153,31 +153,40 @@ ghb_settings_get_string(GValue *settings, const gchar *key)
 }
 
 gint
-ghb_settings_combo_int(GValue *settings, const gchar *key)
+ghb_settings_combo_int(const GValue *settings, const gchar *key)
 {
 	return ghb_lookup_combo_int(key, ghb_settings_get_value(settings, key));
 }
 
+gdouble
+ghb_settings_combo_double(const GValue *settings, const gchar *key)
+{
+	return ghb_lookup_combo_double(key, ghb_settings_get_value(settings, key));
+}
+
 const gchar*
-ghb_settings_combo_option(GValue *settings, const gchar *key)
+ghb_settings_combo_option(const GValue *settings, const gchar *key)
 {
 	return ghb_lookup_combo_option(key, ghb_settings_get_value(settings, key));
 }
 
+const gchar*
+ghb_settings_combo_string(const GValue *settings, const gchar *key)
+{
+	return ghb_lookup_combo_string(key, ghb_settings_get_value(settings, key));
+}
+
 // Map widget names to setting keys
 // Widgets that map to settings have names
 // of this format: s_<setting key>
-static const gchar*
-get_setting_key(GtkWidget *widget)
+const gchar*
+ghb_get_setting_key(GtkWidget *widget)
 {
 	const gchar *name;
 	
 	g_debug("get_setting_key ()\n");
 	if (widget == NULL) return NULL;
-	if (GTK_IS_ACTION(widget))
-		name = gtk_action_get_name(GTK_ACTION(widget));
-	else
-		name = gtk_widget_get_name(widget);
+	name = gtk_buildable_get_name(GTK_BUILDABLE(widget));
 		
 	if (name == NULL)
 	{
@@ -202,10 +211,7 @@ ghb_widget_value(GtkWidget *widget)
 	}
 
 	type = GTK_WIDGET_TYPE(widget);
-	if (GTK_IS_ACTION(widget))
-		name = gtk_action_get_name(GTK_ACTION(widget));
-	else
-		name = gtk_widget_get_name(widget);
+	name = ghb_get_setting_key(widget);
 	g_debug("ghb_widget_value widget (%s)\n", name);
 	if (type == GTK_TYPE_ENTRY)
 	{
@@ -226,6 +232,20 @@ ghb_widget_value(GtkWidget *widget)
 		bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 		value = ghb_boolean_value_new(bval);
 	}
+	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+	{
+		g_debug("\ttoggle_tool_button");
+		gboolean bval;
+		bval = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
+		value = ghb_boolean_value_new(bval);
+	}
+	else if (type == GTK_TYPE_TOGGLE_BUTTON)
+	{
+		g_debug("\ttoggle_button");
+		gboolean bval;
+		bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+		value = ghb_boolean_value_new(bval);
+	}
 	else if (type == GTK_TYPE_TOGGLE_ACTION)
 	{
 		g_debug("\ttoggle action");
@@ -290,7 +310,24 @@ ghb_widget_value(GtkWidget *widget)
 	else if (type == GTK_TYPE_HSCALE)
 	{
 		gdouble dval;
+		gint digits;
+
+		digits = gtk_scale_get_digits(GTK_SCALE(widget));
 		dval = gtk_range_get_value(GTK_RANGE(widget));
+		if (digits)
+		{
+			value = ghb_double_value_new(dval);
+		}
+		else
+		{
+			value = ghb_int_value_new(dval);
+		}
+	}
+	else if (type == GTK_TYPE_SCALE_BUTTON)
+	{
+		gdouble dval;
+
+		dval = gtk_scale_button_get_value(GTK_SCALE_BUTTON(widget));
 		value = ghb_double_value_new(dval);
 	}
 	else if (type == GTK_TYPE_TEXT_VIEW)
@@ -311,6 +348,16 @@ ghb_widget_value(GtkWidget *widget)
 		str = gtk_label_get_text (GTK_LABEL(widget));
 		value = ghb_string_value_new(str);
 	}
+	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
+	{
+		gchar *str;
+		str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
+		if (str == NULL)
+			str = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
+		value = ghb_string_value_new(str);
+		if (str != NULL)
+			g_free(str);
+	}
 	else
 	{
 		g_debug("Attempt to set unknown widget type: %s\n", name);
@@ -389,7 +436,7 @@ ghb_widget_to_setting(GValue *settings, GtkWidget *widget)
 	if (widget == NULL) return;
 	g_debug("ghb_widget_to_setting");
 	// Find corresponding setting
-	key = get_setting_key(widget);
+	key = ghb_get_setting_key(widget);
 	if (key == NULL) return;
 	value = ghb_widget_value(widget);
 	if (value != NULL)
@@ -434,6 +481,16 @@ update_widget(GtkWidget *widget, const GValue *value)
 		g_debug("check button");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
 	}
+	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+	{
+		g_debug("toggle button");
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), ival);
+	}
+	else if (type == GTK_TYPE_TOGGLE_BUTTON)
+	{
+		g_debug("toggle button");
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
+	}
 	else if (type == GTK_TYPE_TOGGLE_ACTION)
 	{
 		g_debug("toggle action");
@@ -449,7 +506,7 @@ update_widget(GtkWidget *widget, const GValue *value)
 		GtkTreeModel *store;
 		GtkTreeIter iter;
 		gchar *shortOpt;
-		gint ivalue;
+		gdouble ivalue;
 		gboolean foundit = FALSE;
 
 		g_debug("combo (%s)", str);
@@ -475,7 +532,7 @@ update_widget(GtkWidget *widget, const GValue *value)
 			do
 			{
 				gtk_tree_model_get(store, &iter, 3, &ivalue, -1);
-				if (ivalue == ival)
+				if ((gint)ivalue == ival || ivalue == dval)
 				{
 					gtk_combo_box_set_active_iter (
 						GTK_COMBO_BOX(widget), &iter);
@@ -494,7 +551,7 @@ update_widget(GtkWidget *widget, const GValue *value)
 		GtkTreeModel *store;
 		GtkTreeIter iter;
 		gchar *shortOpt;
-		gint ivalue;
+		gdouble ivalue;
 		gboolean foundit = FALSE;
 
 		g_debug("GTK_COMBO_BOX_ENTRY");
@@ -520,7 +577,7 @@ update_widget(GtkWidget *widget, const GValue *value)
 			do
 			{
 				gtk_tree_model_get(store, &iter, 3, &ivalue, -1);
-				if (ivalue == ival)
+				if ((gint)ivalue == ival || ivalue == dval)
 				{
 					gtk_combo_box_set_active_iter (
 						GTK_COMBO_BOX(widget), &iter);
@@ -548,6 +605,11 @@ update_widget(GtkWidget *widget, const GValue *value)
 		g_debug("hscale");
 		gtk_range_set_value(GTK_RANGE(widget), dval);
 	}
+	else if (type == GTK_TYPE_SCALE_BUTTON)
+	{
+		g_debug("scale_button");
+		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), dval);
+	}
 	else if (type == GTK_TYPE_TEXT_VIEW)
 	{
 		g_debug("textview (%s)", str);
@@ -555,642 +617,75 @@ update_widget(GtkWidget *widget, const GValue *value)
 												GTK_TEXT_VIEW(widget));
 		gtk_text_buffer_set_text (buffer, str, -1);
 	}
-	else
-	{
-		g_debug("Attempt to set unknown widget type");
-	}
-	g_free(str);
-}
-
-int
-ghb_ui_update(signal_user_data_t *ud, const gchar *name, const GValue *value)
-{
-	GObject *object;
-
-	g_debug("ghb_ui_update() %s", name);
-	if (name == NULL || value == NULL)
-		return 0;
-	object = GHB_OBJECT(ud->builder, name);
-	if (object == NULL)
-	{
-		g_debug("Failed to find widget for key: %s\n", name);
-		return -1;
-	}
-	update_widget((GtkWidget*)object, value);
-	// Its possible the value hasn't changed. Since settings are only
-	// updated when the value changes, I'm initializing settings here as well.
-	ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
-	return 0;
-}
-
-enum
-{
-	X264_OPT_DEBLOCK,
-	X264_OPT_INT,
-	X264_OPT_COMBO,
-	X264_OPT_BOOL,
-};
-
-struct x264_opt_map_s
-{
-	gchar **opt_syns;
-	gchar *name;
-	gchar *def_val;
-	gint type;
-	gboolean found;
-};
-
-static gchar *x264_ref_syns[] = {"ref", "frameref", NULL};
-static gchar *x264_mixed_syns[] = {"mixed-refs", "mixed_refs", NULL};
-static gchar *x264_bframes_syns[] = {"bframes", NULL};
-static gchar *x264_direct_syns[] = 
-	{"direct", "direct-pred", "direct_pred", NULL};
-static gchar *x264_weightb_syns[] = {"weightb", "weight-b", "weight_b", NULL};
-static gchar *x264_brdo_syns[] = {"brdo", "b-rdo", "b_rdo", NULL};
-static gchar *x264_bime_syns[] = {"bime", NULL};
-static gchar *x264_bpyramid_syns[] = {"b-pyramid", "b_pyramid", NULL};
-static gchar *x264_me_syns[] = {"me", NULL};
-static gchar *x264_merange_syns[] = {"merange", "me-range", "me_range", NULL};
-static gchar *x264_subme_syns[] = {"subme", "subq", NULL};
-static gchar *x264_analyse_syns[] = {"analyse", "partitions", NULL};
-static gchar *x264_8x8dct_syns[] = {"8x8dct", NULL};
-static gchar *x264_deblock_syns[] = {"deblock", "filter", NULL};
-static gchar *x264_trellis_syns[] = {"trellis", NULL};
-static gchar *x264_pskip_syns[] = {"no-fast-pskip", "no_fast_pskip", NULL};
-static gchar *x264_decimate_syns[] = 
-	{"no-dct-decimate", "no_dct_decimate", NULL};
-static gchar *x264_cabac_syns[] = {"cabac", NULL};
-
-static gint
-find_syn_match(const gchar *opt, gchar **syns)
-{
-	gint ii;
-	for (ii = 0; syns[ii] != NULL; ii++)
-	{
-		if (strcmp(opt, syns[ii]) == 0)
-			return ii;
-	}
-	return -1;
-}
-
-struct x264_opt_map_s x264_opt_map[] =
-{
-	{x264_ref_syns, "x264_refs", "1", X264_OPT_INT},
-	{x264_mixed_syns, "x264_mixed_refs", "0", X264_OPT_BOOL},
-	{x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT},
-	{x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO},
-	{x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL},
-	{x264_brdo_syns, "x264_brdo", "0", X264_OPT_BOOL},
-	{x264_bime_syns, "x264_bime", "0", X264_OPT_BOOL},
-	{x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL},
-	{x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
-	{x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
-	{x264_subme_syns, "x264_subme", "6", X264_OPT_COMBO},
-	{x264_analyse_syns, "x264_analyse", "some", X264_OPT_COMBO},
-	{x264_8x8dct_syns, "x264_8x8dct", "0", X264_OPT_BOOL},
-	{x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK},
-	{x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK},
-	{x264_trellis_syns, "x264_trellis", "0", X264_OPT_COMBO},
-	{x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL},
-	{x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL},
-	{x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL},
-};
-#define X264_OPT_MAP_SIZE (sizeof(x264_opt_map)/sizeof(struct x264_opt_map_s))
-
-static const gchar*
-x264_opt_get_default(const gchar *opt)
-{
-	gint jj;
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (find_syn_match(opt, x264_opt_map[jj].opt_syns) >= 0)
-		{
-			return x264_opt_map[jj].def_val;
-		}
-	}
-	return "";
-}
-
-static void
-x264_update_int(signal_user_data_t *ud, const gchar *name, const gchar *val)
-{
-	gint ival;
-
-	if (val == NULL) return;
-	ival = g_strtod (val, NULL);
-	ghb_ui_update(ud, name, ghb_int64_value(ival));
-}
-
-static gchar *true_str[] =
-{
-	"true",
-	"yes",
-	"1",
-	NULL
-};
-
-static gboolean 
-str_is_true(const gchar *str)
-{
-	gint ii;
-	for (ii = 0; true_str[ii]; ii++)
-	{
-		if (g_ascii_strcasecmp(str, true_str[ii]) == 0)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-x264_update_bool(signal_user_data_t *ud, const gchar *name, const gchar *val)
-{
-	if (val == NULL)
-		ghb_ui_update(ud, name, ghb_boolean_value(1));
-	else
-		ghb_ui_update(ud, name, ghb_boolean_value(str_is_true(val)));
-}
-
-static void
-x264_update_combo(signal_user_data_t *ud, const gchar *name, const gchar *val)
-{
-	GtkTreeModel *store;
-	GtkTreeIter iter;
-	gchar *shortOpt;
-	gint ivalue;
-	gboolean foundit = FALSE;
-	GtkWidget *widget;
-
-	if (val == NULL) return;
-	widget = GHB_WIDGET(ud->builder, name);
-	if (widget == NULL)
-	{
-		g_debug("Failed to find widget for key: %s\n", name);
-		return;
-	}
-	store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-	if (gtk_tree_model_get_iter_first (store, &iter))
+	else if (type == GTK_TYPE_LABEL)
 	{
-		do
-		{
-			gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
-			if (strcmp(shortOpt, val) == 0)
-			{
-				gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
-				g_free(shortOpt);
-				foundit = TRUE;
-				break;
-			}
-			g_free(shortOpt);
-		} while (gtk_tree_model_iter_next (store, &iter));
+		gtk_label_set_markup (GTK_LABEL(widget), str);
 	}
-	if (!foundit)
+	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
 	{
-		if (gtk_tree_model_get_iter_first (store, &iter))
-		{
-			do
-			{
-				gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
-				if (strcmp(shortOpt, "custom") == 0)
-				{
-					gtk_list_store_set(GTK_LIST_STORE(store), &iter, 4, val, -1);
-					gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
-					g_free(shortOpt);
-					foundit = TRUE;
-					break;
-				}
-				g_free(shortOpt);
-			} while (gtk_tree_model_iter_next (store, &iter));
-		}
-	}
-	// Its possible the value hasn't changed. Since settings are only
-	// updated when the value changes, I'm initializing settings here as well.
-	ghb_widget_to_setting(ud->settings, widget);
-}
-
-static void
-x264_update_deblock(signal_user_data_t *ud, const gchar *xval)
-{
-	gdouble avalue, bvalue;
-	gchar *end;
-	gchar *val;
-	gchar *bval = NULL;
-
-	if (xval == NULL) return;
-	val = g_strdup(xval);
-	bvalue = avalue = 0;
-	if (val != NULL) 
-	{
-		gchar *pos = strchr(val, ',');
-		if (pos != NULL)
-		{
-			bval = pos + 1;
-			*pos = 0;
-		}
-		avalue = g_strtod (val, &end);
-		if (bval != NULL)
+		GtkFileChooserAction act;
+		act = gtk_file_chooser_get_action(GTK_FILE_CHOOSER(widget));
+		if (str[0] == 0)
 		{
-			bvalue = g_strtod (bval, &end);
+			// Do nothing
+			;
 		}
-	}
-	g_free(val);
-	ghb_ui_update(ud, "x264_deblock_alpha", ghb_int64_value(avalue));
-	ghb_ui_update(ud, "x264_deblock_beta", ghb_int64_value(bvalue));
-}
-
-void
-ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options)
-{
-	gchar **split = g_strsplit(options, ":", -1);
-	if (split == NULL) return;
-
-	gint ii;
-	gint jj;
-
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-		x264_opt_map[jj].found = FALSE;
-
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		gchar *val = NULL;
-		gchar *pos = strchr(split[ii], '=');
-		if (pos != NULL)
+		else if (act == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+			act == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
 		{
-			val = pos + 1;
-			*pos = 0;
+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(widget), str);
 		}
-		for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
+		else if (act == GTK_FILE_CHOOSER_ACTION_SAVE)
 		{
-			if (find_syn_match(split[ii], x264_opt_map[jj].opt_syns) >= 0)
-			{
-				x264_opt_map[jj].found = TRUE;
-				switch(x264_opt_map[jj].type)
-				{
-				case X264_OPT_INT:
-					x264_update_int(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_BOOL:
-					x264_update_bool(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_COMBO:
-					x264_update_combo(ud, x264_opt_map[jj].name, val);
-					break;
-				case X264_OPT_DEBLOCK:
-					// dirty little hack.  mark deblock_beta found as well
-					x264_opt_map[jj+1].found = TRUE;
-					x264_update_deblock(ud, val);
-					break;
-				}
-				break;
-			}
+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
 		}
-	}
-	// For any options not found in the option string, set ui to
-	// default values
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (!x264_opt_map[jj].found)
+		else
 		{
-			gchar *val = strdup(x264_opt_map[jj].def_val);
-			switch(x264_opt_map[jj].type)
+			if (g_file_test(str, G_FILE_TEST_IS_DIR))
 			{
-			case X264_OPT_INT:
-				x264_update_int(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_BOOL:
-				x264_update_bool(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_COMBO:
-				x264_update_combo(ud, x264_opt_map[jj].name, val);
-				break;
-			case X264_OPT_DEBLOCK:
-				x264_update_deblock(ud, val);
-				break;
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), str);
 			}
-			x264_opt_map[jj].found = TRUE;
-			g_free(val);
-		}
-	}
-	g_strfreev(split);
-}
-
-gchar*
-get_deblock_val(signal_user_data_t *ud)
-{
-	gchar *alpha, *beta;
-	gchar *result;
-	alpha = ghb_settings_get_string(ud->settings, "x264_deblock_alpha");
-	beta = ghb_settings_get_string(ud->settings, "x264_deblock_beta");
-	result = g_strdup_printf("%s,%s", alpha, beta);
-	g_free(alpha);
-	g_free(beta);
-	return result;
-}
-
-void
-ghb_x264_opt_update(signal_user_data_t *ud, GtkWidget *widget)
-{
-	gint jj;
-	const gchar *name = gtk_widget_get_name(widget);
-	gchar **opt_syns = NULL;
-	const gchar *def_val = NULL;
-	gint type;
-
-	for (jj = 0; jj < X264_OPT_MAP_SIZE; jj++)
-	{
-		if (strcmp(name, x264_opt_map[jj].name) == 0)
-		{
-			// found the options that needs updating
-			opt_syns = x264_opt_map[jj].opt_syns;
-			def_val = x264_opt_map[jj].def_val;
-			type = x264_opt_map[jj].type;
-			break;
-		}
-	}
-	if (opt_syns != NULL)
-	{
-		GString *x264opts = g_string_new("");
-		gchar *options;
-		gchar **split = NULL;
-		gint ii;
-		gboolean foundit = FALSE;
-
-		options = ghb_settings_get_string(ud->settings, "x264_options");
-		if (options)
-		{
-			split = g_strsplit(options, ":", -1);
-			g_free(options);
-		}
-		for (ii = 0; split && split[ii] != NULL; ii++)
-		{
-			gint syn;
-			gchar *val = NULL;
-			gchar *pos = strchr(split[ii], '=');
-			if (pos != NULL)
+			else if (g_file_test(str, G_FILE_TEST_EXISTS))
 			{
-				val = pos + 1;
-				*pos = 0;
-			}
-			syn = find_syn_match(split[ii], opt_syns);
-			if (syn >= 0)
-			{ // Updating this option
-				gchar *val;
-				foundit = TRUE;
-				if (type == X264_OPT_DEBLOCK)
-					val = get_deblock_val(ud);
-				else
-				{
-					GValue *gval;
-					gval = ghb_widget_value(widget);
-					if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
-					{
-						if (ghb_value_boolean(gval))
-							val = g_strdup("1");
-						else
-							val = g_strdup("0");
-					}
-					else
-					{
-						val = ghb_widget_string(widget);
-					}
-					ghb_value_free(gval);
-				}
-				if (strcmp(def_val, val) != 0)
-				{
-					g_string_append_printf(x264opts, "%s=%s:", opt_syns[syn], val);
-				}
-				g_free(val);
+				gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
 			}
-			else if (val != NULL)
-				g_string_append_printf(x264opts, "%s=%s:", split[ii], val);
 			else
-				g_string_append_printf(x264opts, "%s:", split[ii]);
-
-		}
-		if (split) g_strfreev(split);
-		if (!foundit)
-		{
-			gchar *val;
-			if (type == X264_OPT_DEBLOCK)
-				val = get_deblock_val(ud);
-			else
-			{
-				GValue *gval;
-				gval = ghb_widget_value(widget);
-				if (G_VALUE_TYPE(gval) == G_TYPE_BOOLEAN)
-				{
-					if (ghb_value_boolean(gval))
-						val = g_strdup("1");
-					else
-						val = g_strdup("0");
-				}
-				else
-				{
-					val = ghb_widget_string(widget);
-				}
-				ghb_value_free(gval);
-			}
-			if (strcmp(def_val, val) != 0)
 			{
-				g_string_append_printf(x264opts, "%s=%s:", opt_syns[0], val);
+				gchar *dirname;
+
+				dirname = g_path_get_dirname(str);
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), dirname);
+				g_free(dirname);
 			}
-			g_free(val);
 		}
-		// Update the options value
-		// strip the trailing ":"
-		gchar *result;
-		gint len;
-		result = g_string_free(x264opts, FALSE);
-		len = strlen(result);
-		if (len > 0) result[len - 1] = 0;
-		gchar *sopts;
-		sopts = ghb_sanitize_x264opts(ud, result);
-		ghb_ui_update(ud, "x264_options", ghb_string_value(sopts));
-		ghb_x264_parse_options(ud, sopts);
-		g_free(sopts);
-		g_free(result);
 	}
-}
-
-static void
-x264_remove_opt(gchar **opts, gchar **opt_syns)
-{
-	gint ii;
-	for (ii = 0; opts[ii] != NULL; ii++)
+	else
 	{
-		gchar *opt;
-		opt = g_strdup(opts[ii]);
-		gchar *pos = strchr(opt, '=');
-		if (pos != NULL)
-		{
-			*pos = 0;
-		}
-		if (find_syn_match(opt, opt_syns) >= 0)
-		{
-			// Mark as deleted
-			opts[ii][0] = 0;
-		}
-		g_free(opt);
+		g_debug("Attempt to set unknown widget type");
 	}
+	g_free(str);
 }
 
-// Construct the x264 options string
-// The result is allocated, so someone must free it at some point.
-gchar*
-ghb_sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
+int
+ghb_ui_update(signal_user_data_t *ud, const gchar *name, const GValue *value)
 {
-	GString *x264opts = g_string_new("");
-	gchar **split = g_strsplit(options, ":", -1);
-
-	// Remove entries that match the defaults
-	gint ii;
-	for (ii = 0; split[ii] != NULL; ii++)
-	{
-		gchar *val = NULL;
-		gchar *opt = g_strdup(split[ii]);
-		gchar *pos = strchr(opt, '=');
-		if (pos != NULL)
-		{
-			val = pos + 1;
-			*pos = 0;
-		}
-		else
-		{
-			val = "1";
-		}
-		const gchar *def_val = x264_opt_get_default(opt);
-		if (strcmp(val, def_val) == 0)
-		{
-			// Matches the default, so remove it
-			split[ii][0] = 0;
-		}
-		g_free(opt);
-	}
-	gint refs = ghb_settings_get_int(ud->settings, "x264_refs");
-	if (refs <= 1)
-	{
-		x264_remove_opt(split, x264_mixed_syns);
-	}
-	gint subme;
+	GObject *object;
 
-	subme = ghb_lookup_combo_int("x264_subme",
-					ghb_settings_get_value(ud->settings, "x264_subme"));
-	if (subme < 6)
-	{
-		x264_remove_opt(split, x264_brdo_syns);
-	}
-	gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes");
-	if (bframes == 0)
-	{
-		x264_remove_opt(split, x264_weightb_syns);
-		x264_remove_opt(split, x264_brdo_syns);
-		x264_remove_opt(split, x264_bime_syns);
-	}
-	if (bframes <= 1)
-	{
-		x264_remove_opt(split, x264_bpyramid_syns);
-	}
-	gchar *me = ghb_settings_get_string(ud->settings, "x264_me");
-	if (!(strcmp(me, "umh") == 0 || strcmp(me, "esa") == 0))
-	{
-		x264_remove_opt(split, x264_merange_syns);
-	}
-	g_free(me);
-	if (!ghb_settings_get_boolean(ud->settings, "x264_cabac"))
-	{
-		x264_remove_opt(split, x264_trellis_syns);
-	}
-	gint analyse;
-	analyse = ghb_lookup_combo_int("x264_analyse",
-						ghb_settings_get_value(ud->settings, "x264_analyse"));
-	if (analyse == 1)
-	{
-		x264_remove_opt(split, x264_direct_syns);
-	}
-	for (ii = 0; split[ii] != NULL; ii++)
+	g_debug("ghb_ui_update() %s", name);
+	if (name == NULL || value == NULL)
+		return 0;
+	object = GHB_OBJECT(ud->builder, name);
+	if (object == NULL)
 	{
-		if (split[ii][0] != 0)
-			g_string_append_printf(x264opts, "%s:", split[ii]);
+		g_debug("Failed to find widget for key: %s\n", name);
+		return -1;
 	}
-	g_strfreev(split);
-	// strip the trailing ":"
-	gchar *result;
-	gint len;
-	result = g_string_free(x264opts, FALSE);
-	len = strlen(result);
-	if (len > 0) result[len - 1] = 0;
-	return result;
-}
-
-gint
-ghb_pref_acount(GValue *settings)
-{
-	GValue *acodec;
-	acodec = ghb_settings_get_value(settings, "pref_audio_codec");
-	return ghb_array_len(acodec);
-}
-
-gint
-ghb_pref_acodec(GValue *settings, gint index)
-{
-	GValue *acodec;
-	gint count;
-
-	acodec = ghb_settings_get_value(settings, "pref_audio_codec");
-	count = ghb_array_len(acodec);
-	if (index >= count)
-		return 0;
-	return ghb_value_int(ghb_array_get_nth(acodec, index));
-}
-
-gint
-ghb_pref_bitrate(GValue *settings, gint index)
-{
-	GValue *bitrate;
-	gint count;
-
-	bitrate = ghb_settings_get_value(settings, "pref_audio_bitrate");
-	count = ghb_array_len(bitrate);
-	if (index >= count)
-		return 0;
-	return ghb_value_int(ghb_array_get_nth(bitrate, index));
-}
-
-gint
-ghb_pref_rate(GValue *settings, gint index)
-{
-	GValue *rate;
-	gint count;
-
-	rate = ghb_settings_get_value(settings, "pref_audio_rate");
-	count = ghb_array_len(rate);
-	if (index >= count)
-		return 0;
-	return ghb_value_int(ghb_array_get_nth(rate, index));
-}
-
-gint
-ghb_pref_mix(GValue *settings, gint index)
-{
-	GValue *mix;
-	gint count;
-
-	mix = ghb_settings_get_value(settings, "pref_audio_mix");
-	count = ghb_array_len(mix);
-	if (index >= count)
-		return 0;
-	return ghb_value_int(ghb_array_get_nth(mix, index));
-}
-
-gdouble
-ghb_pref_drc(GValue *settings, gint index)
-{
-	GValue *drc;
-	gint count;
-
-	drc = ghb_settings_get_value(settings, "pref_audio_drc");
-	count = ghb_array_len(drc);
-	if (index >= count)
-		return 0;
-	return ghb_value_double(ghb_array_get_nth(drc, index));
+	update_widget((GtkWidget*)object, value);
+	// Its possible the value hasn't changed. Since settings are only
+	// updated when the value changes, I'm initializing settings here as well.
+	ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
+	return 0;
 }