LinGui: Make preset key/values mostly align with macui presets.

[handbrake-jp/handbrake-jp-git.git] / gtk / src / settings.h

diff --git a/gtk/src/settings.h b/gtk/src/settings.h
index 99d8e68..b788799 100644 (file)
--- 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)))
@@ -44,9 +41,11 @@ typedef struct
        gchar *current_dvd_device;
        gboolean debug;
        gboolean dont_clear_presets;
+       gboolean cancel_encode;
        GtkBuilder *builder;
        GValue *settings;
        GValue *queue;
+       GValue *current_job;
        GIOChannel *activity_log;
 } signal_user_data_t;
 
@@ -70,9 +69,6 @@ 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);
@@ -81,30 +77,18 @@ 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);
+gint ghb_settings_combo_int(GValue *settings, const gchar *key);
+const gchar* ghb_settings_combo_option(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);
-
 #endif // _SETTINGS_H_