X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.h;h=2f964037511ffe2dbadb915dfdf440c052a38f7c;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=8c2cac821c5bb3a232be99abae74f65b9e905b15;hpb=13bd7f552ba09e6e9d8bf0ccccb8a60a08d9d8da;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.h b/gtk/src/settings.h
index 8c2cac82..2f964037 100644
--- a/gtk/src/settings.h
+++ b/gtk/src/settings.h
@@ -34,6 +34,15 @@ 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;
@@ -43,7 +52,8 @@ typedef struct
 	gchar *current_dvd_device;
 	gboolean debug;
 	gboolean dont_clear_presets;
-	gboolean cancel_encode;
+	gboolean scale_busy;
+	gint cancel_encode;
 	GtkBuilder *builder;
 	GValue *settings;
 	GValue *queue;
@@ -53,6 +63,7 @@ typedef struct
 	preview_t *preview;
 	gchar *appcast;
 	gint appcast_len;
+	GdkVisibilityState hb_visibility;
 } signal_user_data_t;
 
 enum
@@ -86,6 +97,7 @@ 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);
@@ -97,5 +109,6 @@ 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);
+const gchar* ghb_get_setting_key(GtkWidget *widget);
 
 #endif // _SETTINGS_H_