X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fx264handler.c;h=17c67db362bffa0255205692c35564a28da642f2;hb=023bc0f853674db16682807936aabf77139c1bb7;hp=20ec56e5f0d133ddcbf3a7cd2512359c1c8ffaa0;hpb=d30e717f9c1508618527e93e2f26412cddfc2d3b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 20ec56e5..17c67db3 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -26,7 +26,7 @@ static gchar* sanitize_x264opts(signal_user_data_t *ud, const gchar *options);
 // Flag needed to prevent x264 options processing from chasing its tail
 static gboolean ignore_options_update = FALSE;
 
-void
+G_MODULE_EXPORT void
 x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	ghb_widget_to_setting(ud->settings, widget);
@@ -40,7 +40,7 @@ x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	ghb_clear_presets_selection(ud);
 }
 
-void
+G_MODULE_EXPORT void
 x264_me_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	gint me;
@@ -68,7 +68,7 @@ x264_me_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	}
 }
 
-void
+G_MODULE_EXPORT void
 x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	g_debug("x264_entry_changed_cb ()");
@@ -96,7 +96,7 @@ x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	}
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
 	signal_user_data_t *ud)
 {
@@ -651,6 +651,56 @@ x264_remove_opt(gchar **opts, gchar **opt_syns)
 	}
 }
 
+static gchar*
+x264_lookup_value(gchar **opts, gchar **opt_syns)
+{
+	gchar *ret = NULL;
+	gint pos;
+
+	const gchar *def_val = x264_opt_get_default(opt_syns[0]);
+
+	pos = x264_find_opt(opts, opt_syns);
+	if (pos >= 0)
+	{
+		gchar *cpos = strchr(opts[pos], '=');
+		if (cpos != NULL)
+		{
+			ret = g_strdup(cpos+1);
+		}
+		else
+		{
+			ret = g_strdup("");
+		}
+	}
+	else if (def_val != NULL)
+	{
+		ret = g_strdup(def_val);
+	}
+	return ret;
+}
+
+gint
+ghb_lookup_badapt(gchar *options)
+{
+	gint ret = 0;
+	gchar *result;
+	gchar **split;
+	
+	if (options == NULL)
+		options = "";
+
+	split = g_strsplit(options, ":", -1);
+
+	result = x264_lookup_value(split, x264_badapt_syns);
+	g_strfreev(split);
+	if (result != NULL)
+	{
+		ret = g_strtod(result, NULL);
+		g_free(result);
+	}
+	return ret;
+}
+
 // Construct the x264 options string
 // The result is allocated, so someone must free it at some point.
 static gchar*