LinGui: Changes required by latest x264

[handbrake-jp/handbrake-jp-git.git] / gtk / src / hb-backend.c

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 3959dce..9eea5a6 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -163,6 +163,8 @@ static options_map_t d_subme_opts[] =
        {"5", "5", 5, "5"},
        {"6", "6", 6, "6"},
        {"7", "7", 7, "7"},
+       {"8", "8", 8, "8"},
+       {"9", "9", 9, "9"},
 };
 combo_opts_t subme_opts =
 {
@@ -549,7 +551,7 @@ lookup_mix_int(const GValue *mix)
 {
        gint ii;
        gchar *str;
-       gint result = HB_AMIXDOWN_DOLBYPLII;
+       gint result = 0;
 
 
        str = ghb_value_string(mix);
@@ -1886,29 +1888,17 @@ audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
                        else if (ivalue > last)
                        {
                                ii++;
-                               done = !gtk_list_store_remove(store, &iter);
+                               gtk_list_store_set(store, &iter, 1, FALSE, -1);
+                               done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
                        }
                        else
                        {
                                ii++;
+                               gtk_list_store_set(store, &iter, 1, TRUE, -1);
                                done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
                        }
                } while (!done);
        }
-       for (; ii < hb_audio_bitrates_count; ii++)
-       {
-               if (hb_audio_bitrates[ii].rate <= last)
-               {
-                       gtk_list_store_append(store, &iter);
-                       gtk_list_store_set(store, &iter, 
-                                                               0, hb_audio_bitrates[ii].string, 
-                                                               1, TRUE, 
-                                                               2, hb_audio_bitrates[ii].string, 
-                                                               3, hb_audio_bitrates[ii].rate, 
-                                                               4, hb_audio_bitrates[ii].string, 
-                                                               -1);
-               }
-       }
 }
 
 static void