LinGui: use hb_video_encoder_get_presets()

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6075 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/main.c b/gtk/src/main.c
index 9232a1fc6fe38b78ca3f25c89480ff132742f29d..6a778c003936430b0fe771c9e648b35d54dd4dfb 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -1002,7 +1002,7 @@ main(int argc, char *argv[])
     GtkWidget *presetSlider = GHB_WIDGET(ud->builder, "x264PresetSlider");
     const char * const *x264_presets;
     int count = 0;
-    x264_presets = hb_x264_presets();
+    x264_presets = hb_video_encoder_get_presets(HB_VCODEC_X264);
     while (x264_presets && x264_presets[count]) count++;
     gtk_range_set_range(GTK_RANGE(presetSlider), 0, count-1);
 

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 940cadaaa8a14a72ad9d244bdd856085ef805647..fe3172f5e2281295bfdd6e3460003023201e0000 100644 (file)
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -1047,12 +1047,13 @@ ghb_preset_to_settings(GValue *settings, GValue *preset)
         ghb_dict_remove(settings, "x264Option");
     }
 
-    const char * const *x264preset = hb_x264_presets();
+    const char * const *x264presets;
+    x264presets = hb_video_encoder_get_presets(HB_VCODEC_X264);
     char *x264Preset = ghb_settings_get_string(settings, "x264Preset");
     int ii;
-    for (ii = 0; x264preset[ii]; ii++)
+    for (ii = 0; x264presets[ii]; ii++)
     {
-        if (!strcasecmp(x264Preset, x264preset[ii]))
+        if (!strcasecmp(x264Preset, x264presets[ii]))
         {
             ghb_settings_set_int(settings, "x264PresetSlider", ii);
         }

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index ad3e92ca2e2d0e56bea5c0e47b8ebccf6d752e51..09b15613b60c7583aab6a028eb04a676646b99b0 100644 (file)
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -91,7 +91,8 @@ x264_setting_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
     ghb_widget_to_setting(ud->settings, widget);
 
     int x264Preset = ghb_settings_get_int(ud->settings, "x264PresetSlider");
-    const char * preset = hb_x264_presets()[x264Preset];
+    const char *preset;
+    preset = hb_video_encoder_get_presets(HB_VCODEC_X264)[x264Preset];
     ghb_settings_set_string(ud->settings, "x264Preset", preset);
 
     if (!ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
@@ -1255,7 +1256,7 @@ format_x264_preset_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
     const char * const *x264_presets;
     const char *preset = "medium";
 
-    x264_presets = hb_x264_presets();
+    x264_presets = hb_video_encoder_get_presets(HB_VCODEC_X264);
 
     preset = x264_presets[(int)val];