X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.h;h=5ec717f0c7a243e4ee227ad824ceae04c22a40b6;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=99d8e6866356aad3969f3eacc883fcfb924a453d;hpb=9722b67681ddee372b08c57248c24eb39868c566;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.h b/gtk/src/settings.h
index 99d8e686..5ec717f0 100644
--- a/gtk/src/settings.h
+++ b/gtk/src/settings.h
@@ -18,9 +18,6 @@
 
 #include <gtk/gtk.h>
 
-#define PRESET_CUSTOM	1
-#define PRESET_DEFAULT	2
-
 #define GHB_WIDGET(b,n)	GTK_WIDGET(gtk_builder_get_object ((b), (n)))
 //#define GHB_WIDGET(b,n)	GTK_WIDGET(debug_get_object((b), (n)))
 #define GHB_ACTION(b,n)	GTK_ACTION(gtk_builder_get_object ((b), (n)))
@@ -37,17 +34,35 @@ enum
 	GHB_STATE_WORKDONE 	= 0x10,
 	GHB_STATE_PAUSED 	= 0x20,
 	GHB_STATE_MUXING 	= 0x40,
+	GHB_STATE_SEARCHING	= 0x80,
+};
+
+enum
+{
+	GHB_CANCEL_NONE,
+	GHB_CANCEL_ALL,
+	GHB_CANCEL_CURRENT,
+	GHB_CANCEL_FINISH
 };
 
+typedef struct preview_s preview_t;
+
 typedef struct
 {
 	gchar *current_dvd_device;
 	gboolean debug;
 	gboolean dont_clear_presets;
+	gint cancel_encode;
 	GtkBuilder *builder;
 	GValue *settings;
 	GValue *queue;
+	GValue *current_job;
 	GIOChannel *activity_log;
+	GIOChannel *job_activity_log;
+	preview_t *preview;
+	gchar *appcast;
+	gint appcast_len;
+	GdkVisibilityState hb_visibility;
 } signal_user_data_t;
 
 enum
@@ -70,41 +85,29 @@ void ghb_settings_set_int64(GValue *settings, const gchar *key, gint64 ival);
 void ghb_settings_set_int(GValue *settings, const gchar *key, gint ival);
 void ghb_settings_set_boolean(
 	GValue *settings, const gchar *key, gboolean bval);
-void ghb_settings_set_combo(
-	GValue *settings, const gchar *key, gint index, const gchar *option,
-	const gchar *shortOpt, const gchar *svalue, gint ivalue);
 void ghb_settings_copy(
 	GValue *settings, const gchar *key, const GValue *value);
-GValue* ghb_settings_get_value(GValue *settings, const gchar *key);
-gboolean ghb_settings_get_boolean(GValue *settings, const gchar *key);
-gint64 ghb_settings_get_int64(GValue *settings, const gchar *key);
-gint ghb_settings_get_int(GValue *settings, const gchar *key);
-gdouble ghb_settings_get_double(GValue *settings, const gchar *key);
-gchar* ghb_settings_get_string(GValue *settings, const gchar *key);
-gint ghb_settings_get_combo_index(GValue *settings, const gchar *key);
-gchar* ghb_settings_get_combo_option(GValue *settings, const gchar *name);
-gchar* ghb_settings_get_combo_string(GValue *settings, const gchar *key);
+GValue* ghb_settings_get_value(const GValue *settings, const gchar *key);
+gboolean ghb_settings_get_boolean(const GValue *settings, const gchar *key);
+gint64 ghb_settings_get_int64(const GValue *settings, const gchar *key);
+gint ghb_settings_get_int(const GValue *settings, const gchar *key);
+gdouble ghb_settings_get_double(const GValue *settings, const gchar *key);
+gchar* ghb_settings_get_string(const GValue *settings, const gchar *key);
+gint ghb_settings_combo_int(const GValue *settings, const gchar *key);
+gdouble ghb_settings_combo_double(const GValue *settings, const gchar *key);
+const gchar* ghb_settings_combo_option(const GValue *settings, const gchar *key);
+const gchar* ghb_settings_combo_string(const GValue *settings, const gchar *key);
 
 GValue* ghb_widget_value(GtkWidget *widget);
 gchar* ghb_widget_string(GtkWidget *widget);
 gdouble ghb_widget_double(GtkWidget *widget);
 gint64 ghb_widget_int64(GtkWidget *widget);
 gint ghb_widget_int(GtkWidget *widget);
-gint ghb_widget_index(GtkWidget *widget);
+gint ghb_widget_boolean(GtkWidget *widget);
 
 void ghb_widget_to_setting(GValue *settings, GtkWidget *widget);
 int ghb_ui_update(
 	signal_user_data_t *ud, const gchar *name, const GValue *value);
-
-void ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options);
-void ghb_x264_opt_update(signal_user_data_t *ud, GtkWidget *widget);
-gchar* ghb_sanitize_x264opts(signal_user_data_t *ud, const gchar *options);
-
-gint ghb_pref_acount(GValue *settings);
-gint ghb_pref_acodec(GValue *settings, gint index);
-gint ghb_pref_bitrate(GValue *settings, gint index);
-gint ghb_pref_rate(GValue *settings, gint index);
-gint ghb_pref_mix(GValue *settings, gint index);
-gdouble ghb_pref_drc(GValue *settings, gint index);
+const gchar* ghb_get_setting_key(GtkWidget *widget);
 
 #endif // _SETTINGS_H_