OSDN Git Service

LinGui: revert the extra widgets for subtitle foreign audio search
[handbrake-jp/handbrake-jp-git.git] / gtk / src / subtitlehandler.c
index a910e2a..ea863b6 100644 (file)
@@ -18,6 +18,7 @@
 #include "values.h"
 #include "callbacks.h"
 #include "preview.h"
+#include "presets.h"
 #include "subtitlehandler.h"
 
 static void add_to_subtitle_list(signal_user_data_t *ud, GValue *settings);
@@ -35,15 +36,100 @@ free_subtitle_key(gpointer data)
                g_free(data);
 }
 
-static void
-add_pref(signal_user_data_t *ud, GValue *settings)
+static gboolean
+mustBurn(signal_user_data_t *ud, gint track)
+{
+       gint mux;
+
+       mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+       if (mux == HB_MUX_MP4)
+       {
+               gint source;
+
+               // MP4 can only handle burned vobsubs.  make sure there isn't
+               // already something burned in the list
+               source = ghb_subtitle_track_source(ud, track);
+               if (source == VOBSUB)
+               {
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
+void
+ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index)
+{
+       GValue *subtitle_list;
+       GValue *settings;
+       gint ii, count, tt;
+       GtkTreeView  *tv;
+       GtkTreeModel *tm;
+       GtkTreeIter   ti;
+       gboolean burned;
+
+       g_debug("ghb_subtitle_exclusive_burn");
+       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+       count = ghb_array_len(subtitle_list);
+       for (ii = 0; ii < count; ii++)
+       {
+               settings = ghb_array_get_nth(subtitle_list, ii);
+               tt = ghb_settings_combo_int(settings, "SubtitleTrack");
+               burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+
+               tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+               g_return_if_fail(tv != NULL);
+               tm = gtk_tree_view_get_model(tv);
+               gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+               if (burned && ii != index && !mustBurn(ud, tt))
+               {
+                       ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE);
+                       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, FALSE, -1);
+               }
+       }
+}
+
+void
+ghb_subtitle_exclusive_default(signal_user_data_t *ud, gint index)
+{
+       GValue *subtitle_list;
+       GValue *settings;
+       gint ii, count;
+       GtkTreeView  *tv;
+       GtkTreeModel *tm;
+       GtkTreeIter   ti;
+       gboolean def;
+
+       g_debug("ghb_subtitle_exclusive_default");
+       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+       count = ghb_array_len(subtitle_list);
+       for (ii = 0; ii < count; ii++)
+       {
+               settings = ghb_array_get_nth(subtitle_list, ii);
+               def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+               tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+               g_return_if_fail(tv != NULL);
+               tm = gtk_tree_view_get_model(tv);
+               gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+               if (def && ii != index)
+               {
+
+                       ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
+                       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, FALSE, -1);
+               }
+       }
+}
+
+void
+ghb_add_subtitle(signal_user_data_t *ud, GValue *settings)
 {
        // Add the current subtitle settings to the list.
-       GtkWidget *widget;
-       gint count;
        GValue *subtitle_list;
+       gint count;
+       gboolean burned;
        
-       g_debug("add_pref ()");
+       g_debug("ghb_add_subtitle ()");
 
        // Only allow up to 8 subtitle entries
        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
@@ -52,13 +138,40 @@ add_pref(signal_user_data_t *ud, GValue *settings)
                subtitle_list = ghb_array_value_new(8);
                ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
        }
+       count = ghb_array_len(subtitle_list);
        ghb_array_append(subtitle_list, settings);
        add_to_subtitle_list(ud, settings);
-       count = ghb_array_len(subtitle_list);
-       if (count >= 8)
+
+       burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+       if (burned)
+               ghb_subtitle_exclusive_burn(ud, count);
+}
+
+static void
+add_all_pref_subtitles(signal_user_data_t *ud)
+{
+       const GValue *pref_subtitle;
+       GValue *subtitle;
+       gint count, ii, track;
+       char *lang;
+
+       pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList");
+       count = ghb_array_len(pref_subtitle);
+       for (ii = 0; ii < count; ii++)
        {
-               widget = GHB_WIDGET(ud->builder, "subtitle_add");
-               gtk_widget_set_sensitive(widget, FALSE);
+               subtitle = ghb_value_dup(ghb_array_get_nth(pref_subtitle, ii));
+               lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
+               // If there are multiple subtitles using the same language, then
+               // select sequential tracks for each.  The hash keeps track 
+               // of the tracks used for each language.
+               track = ghb_find_pref_subtitle_track(lang);
+               g_free(lang);
+               if (track >= -1)
+               {
+                       // Add to subtitle list
+                       ghb_settings_set_int(subtitle, "SubtitleTrack", track);
+                       ghb_add_subtitle(ud, subtitle);
+               }
        }
 }
 
@@ -66,7 +179,6 @@ void
 ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud)
 {
        gint track;
-       GtkWidget *button;
        GHashTable *track_indices;
        char *lang;
 
@@ -74,32 +186,38 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud)
        GValue *subtitle;
        gint count, ii;
        
-       g_debug("ghb_set_pref_subtitle");
+       g_debug("ghb_set_pref_subtitle %d", titleindex);
        track_indices = g_hash_table_new_full(g_str_hash, g_str_equal, 
                                                                                        NULL, free_subtitle_index_list);
+
+       ghb_ui_update(ud, "SubtitleTrack", ghb_int_value(0));
+
        // Clear the subtitle list
        ghb_clear_subtitle_list(ud);
-       // Find "best" subtitle based on subtitle preferences
-       button = GHB_WIDGET (ud->builder, "subtitle_add");
+       if (titleindex < 0)
+       {
+               add_all_pref_subtitles(ud);
+               return;
+       }
 
+       // Find "best" subtitle based on subtitle preferences
        pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList");
 
        count = ghb_array_len(pref_subtitle);
        for (ii = 0; ii < count; ii++)
        {
-               subtitle = ghb_value_dup(ghb_array_get_nth(pref_subtitle, ii));
+               subtitle = ghb_array_get_nth(pref_subtitle, ii);
                lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
                // If there are multiple subtitles using the same language, then
                // select sequential tracks for each.  The hash keeps track 
                // of the tracks used for each language.
                track = ghb_find_subtitle_track(titleindex, lang, track_indices);
                g_free(lang);
-               if (track >= 0)
+               if (track >= -1)
                {
-                       ghb_settings_set_int(subtitle, "SubtitleTrack", track);
-                       // Add to subtitle list
-                       add_pref(ud, subtitle);
-                       ghb_ui_update(ud, "SubtitleTrack", ghb_int64_value(track));
+                       GValue *dup = ghb_value_dup(subtitle);
+                       ghb_settings_set_int(dup, "SubtitleTrack", track);
+                       ghb_add_subtitle(ud, dup);
                }
        }
        g_hash_table_destroy(track_indices);
@@ -163,62 +281,6 @@ ghb_selected_subtitle_settings(signal_user_data_t *ud)
        return settings;
 }
 
-static void
-subtitle_list_refresh_selected(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreePath *treepath;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gint *indices;
-       gint row;
-       GValue *settings = NULL;
-       const GValue *subtitle_list;
-       
-       g_debug("subtitle_list_refresh_selected ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               const gchar *track, *source;
-               gboolean forced, burned;
-               gchar *s_track;
-               gint i_track;
-
-               // Get the row number
-               treepath = gtk_tree_model_get_path (store, &iter);
-               indices = gtk_tree_path_get_indices (treepath);
-               row = indices[0];
-               gtk_tree_path_free(treepath);
-               // find subtitle settings
-               if (row < 0) return;
-               subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-               if (row >= ghb_array_len(subtitle_list))
-                       return;
-               settings = ghb_array_get_nth(subtitle_list, row);
-
-               track = ghb_settings_combo_option(settings, "SubtitleTrack");
-               forced = ghb_settings_get_boolean(settings, "SubtitleForced");
-               burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
-
-               s_track = ghb_settings_get_string(settings, "SubtitleTrack");
-               i_track = ghb_settings_get_int(settings, "SubtitleTrack");
-               source = ghb_subtitle_track_source_name(ud, i_track);
-
-               gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
-                       // These are displayed in list
-                       0, track,
-                       1, forced,
-                       2, burned,
-                       3, source,
-                       // These are used to set combo values when a list item is selected
-                       4, s_track,
-                       -1);
-               g_free(s_track);
-       }
-}
-
 G_MODULE_EXPORT void
 subtitle_forced_toggled_cb(
        GtkCellRendererToggle *cell, 
@@ -232,6 +294,8 @@ subtitle_forced_toggled_cb(
        gint          row;
        GtkTreePath  *tp;
        gint *indices;
+       GValue *subtitle_list, *settings;
+       gint source, track;
 
        g_debug("forced toggled");
        tp = gtk_tree_path_new_from_string (path);
@@ -242,47 +306,26 @@ subtitle_forced_toggled_cb(
        gtk_tree_model_get_iter(tm, &ti, tp);
        gtk_tree_model_get(tm, &ti, 1, &active, -1);
        active ^= 1;
-       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1);
 
        // Get the row number
        indices = gtk_tree_path_get_indices (tp);
        row = indices[0];
        gtk_tree_path_free(tp);
 
-       if (row >= 0)
-       {
-               GValue *subtitle_list;
-
-               subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-               if (row < ghb_array_len(subtitle_list))
-               {
-                       GValue *settings;
+       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
 
-                       settings = ghb_array_get_nth(subtitle_list, row);
-                       ghb_settings_set_boolean(settings, "SubtitleForced", active);
-               }
-       }
-}
+       if (row < 0 || row >= ghb_array_len(subtitle_list))
+               return;
 
-static gboolean
-mustBurn(signal_user_data_t *ud, gint track)
-{
-       gint mux;
+       settings = ghb_array_get_nth(subtitle_list, row);
+       track = ghb_settings_combo_int(settings, "SubtitleTrack");
 
-       mux = ghb_settings_combo_int(ud->settings, "FileFormat");
-       if (mux == HB_MUX_MP4)
-       {
-               gint source;
+       source = ghb_subtitle_track_source(ud, track);
+       if (source != VOBSUB)
+               return;
 
-               // MP4 can only handle burned vobsubs.  make sure there isn't
-               // already something burned in the list
-               source = ghb_subtitle_track_source(ud, track);
-               if (source == VOBSUB)
-               {
-                       return TRUE;
-               }
-       }
-       return FALSE;
+       ghb_settings_set_boolean(settings, "SubtitleForced", active);
+       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1);
 }
 
 G_MODULE_EXPORT void
@@ -299,7 +342,7 @@ subtitle_burned_toggled_cb(
        gint          row;
        gint *indices;
        GValue *subtitle_list;
-       gint count, track;
+       gint count, track, source;
        GValue *settings;
 
        g_debug("burned toggled");
@@ -324,31 +367,138 @@ subtitle_burned_toggled_cb(
 
        settings = ghb_array_get_nth(subtitle_list, row);
        track = ghb_settings_combo_int(settings, "SubtitleTrack");
+
+       source = ghb_subtitle_track_source(ud, track);
+       if (source != VOBSUB)
+               return;
+
        if (!active && mustBurn(ud, track))
                return;
 
        ghb_settings_set_boolean(settings, "SubtitleBurned", active);
+
        gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, active, -1);
+       // Unburn the rest
+       if (active)
+               ghb_subtitle_exclusive_burn(ud, row);
 }
 
-static gboolean
-trackUsed(signal_user_data_t *ud, gint track)
+G_MODULE_EXPORT void
+subtitle_default_toggled_cb(
+       GtkCellRendererToggle *cell, 
+       gchar                 *path,
+       signal_user_data_t    *ud)
 {
-       gint ii, count, tt;
-       GValue *settings, *subtitle_list;
+       GtkTreeView  *tv;
+       GtkTreeModel *tm;
+       GtkTreeIter   ti;
+       GtkTreePath  *tp;
+       gboolean      active;
+       gint          row;
+       gint *indices;
+       GValue *subtitle_list;
+       gint count, track;
+       GValue *settings;
+
+       g_debug("default toggled");
+       tp = gtk_tree_path_new_from_string (path);
+       tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+       g_return_if_fail(tv != NULL);
+       tm = gtk_tree_view_get_model(tv);
+       g_return_if_fail(tm != NULL);
+       gtk_tree_model_get_iter(tm, &ti, tp);
+       gtk_tree_model_get(tm, &ti, 3, &active, -1);
+       active ^= 1;
+
+       // Get the row number
+       indices = gtk_tree_path_get_indices (tp);
+       row = indices[0];
+       gtk_tree_path_free(tp);
 
        subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
        count = ghb_array_len(subtitle_list);
-       for (ii = 0; ii < count; ii++)
+       if (row < 0 || row >= count)
+               return;
+
+       settings = ghb_array_get_nth(subtitle_list, row);
+       track = ghb_settings_combo_int(settings, "SubtitleTrack");
+
+       ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", active);
+
+       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, active, -1);
+       // allow only one default
+       ghb_subtitle_exclusive_default(ud, row);
+}
+
+static void
+subtitle_list_refresh_selected(signal_user_data_t *ud)
+{
+       GtkTreeView *treeview;
+       GtkTreePath *treepath;
+       GtkTreeSelection *selection;
+       GtkTreeModel *store;
+       GtkTreeIter iter;
+       gint *indices;
+       gint row;
+       GValue *settings = NULL;
+       const GValue *subtitle_list;
+       
+       g_debug("subtitle_list_refresh_selected ()");
+       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+       selection = gtk_tree_view_get_selection (treeview);
+       if (gtk_tree_selection_get_selected(selection, &store, &iter))
        {
-               settings = ghb_array_get_nth(subtitle_list, ii);
-               tt = ghb_settings_combo_int(settings, "SubtitleTrack");
-               if (tt == track)
+               const gchar *track, *source;
+               gboolean forced, burned, def;
+               gchar *s_track;
+               gint i_track;
+       
+               // Get the row number
+               treepath = gtk_tree_model_get_path (store, &iter);
+               indices = gtk_tree_path_get_indices (treepath);
+               row = indices[0];
+               gtk_tree_path_free(treepath);
+               // find audio settings
+               if (row < 0) return;
+               subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+               if (row >= ghb_array_len(subtitle_list))
+                       return;
+               settings = ghb_array_get_nth(subtitle_list, row);
+
+               track = ghb_settings_combo_option(settings, "SubtitleTrack");
+               forced = ghb_settings_get_boolean(settings, "SubtitleForced");
+               burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+               def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+
+               s_track = ghb_settings_get_string(settings, "SubtitleTrack");
+               i_track = ghb_settings_get_int(settings, "SubtitleTrack");
+               source = ghb_subtitle_track_source_name(ud, i_track);
+
+               gint i_source;
+               i_source = ghb_subtitle_track_source(ud, i_track);
+               if (i_source != VOBSUB)
                {
-                       return TRUE;
+                       // Force and burn only apply to VOBSUBS
+                       forced = FALSE;
+                       burned = FALSE;
+                       ghb_settings_set_boolean(settings, "SubtitleForced", forced);
+                       ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
                }
+
+               gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
+                       // These are displayed in list
+                       0, track,
+                       1, forced,
+                       2, burned,
+                       3, def,
+                       4, source,
+                       // These are used to set combo box values when a list item is selected
+                       5, s_track,
+                       -1);
+               g_free(s_track);
+               if (burned)
+                       ghb_subtitle_exclusive_burn(ud, row);
        }
-       return FALSE;
 }
 
 G_MODULE_EXPORT void
@@ -361,65 +511,13 @@ subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        settings = ghb_selected_subtitle_settings(ud);
        if (settings != NULL)
        {
-               const gchar *lang;
-               GValue *gval;
-               GtkWidget *widget;
-               gint track;
-
-               widget = GHB_WIDGET (ud->builder, "SubtitleTrack");
-               gval = ghb_widget_value(widget);
-               track = ghb_value_int(gval);
-               ghb_value_free(gval);
-               if (trackUsed(ud, track))
-                       return;
                ghb_widget_to_setting(settings, widget);
-               track = ghb_settings_combo_int(settings, "SubtitleTrack");
-               lang = ghb_settings_combo_string(settings, "SubtitleTrack");
-               if (mustBurn(ud, track))
-               {
-                       ghb_settings_set_boolean(settings, "SubtitleBurned", TRUE);
-               }
-               else
-               {
-                       ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE);
-               }
-               ghb_settings_set_string(settings, "SubtitleLanguage", lang);
                subtitle_list_refresh_selected(ud);
        }
        ghb_live_reset(ud);
 }
 
 void
-ghb_subtitle_adjust_burn(signal_user_data_t *ud)
-{
-       GValue *subtitle_list;
-       GValue *settings;
-       gint ii, count, track;
-       GtkTreeView  *tv;
-       GtkTreeModel *tm;
-       GtkTreeIter   ti;
-
-       g_debug("ghb_subtitle_adjust_burn");
-       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-       count = ghb_array_len(subtitle_list);
-       for (ii = 0; ii < count; ii++)
-       {
-               settings = ghb_array_get_nth(subtitle_list, ii);
-               track = ghb_settings_combo_int(settings, "SubtitleTrack");
-               if (mustBurn(ud, track))
-               {
-                       tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
-                       g_return_if_fail(tv != NULL);
-                       tm = gtk_tree_view_get_model(tv);
-                       gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
-
-                       ghb_settings_set_boolean(settings, "SubtitleBurned", TRUE);
-                       gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, TRUE, -1);
-               }
-       }
-}
-
-void
 ghb_clear_subtitle_list(signal_user_data_t *ud)
 {
        GtkTreeView *treeview;
@@ -441,14 +539,16 @@ ghb_clear_subtitle_list(signal_user_data_t *ud)
 }
 
 static void
-add_to_subtitle_list(signal_user_data_t *ud, GValue *settings)
+add_to_subtitle_list(
+       signal_user_data_t *ud, 
+       GValue *settings)
 {
        GtkTreeView *treeview;
        GtkTreeIter iter;
        GtkListStore *store;
        GtkTreeSelection *selection;
        const gchar *track, *source;
-       gboolean forced, burned;
+       gboolean forced, burned, def;
        gchar *s_track;
        gint i_track;
        
@@ -460,6 +560,7 @@ add_to_subtitle_list(signal_user_data_t *ud, GValue *settings)
        track = ghb_settings_combo_option(settings, "SubtitleTrack");
        forced = ghb_settings_get_boolean(settings, "SubtitleForced");
        burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+       def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
 
        s_track = ghb_settings_get_string(settings, "SubtitleTrack");
        i_track = ghb_settings_get_int(settings, "SubtitleTrack");
@@ -471,9 +572,10 @@ add_to_subtitle_list(signal_user_data_t *ud, GValue *settings)
                0, track,
                1, forced,
                2, burned,
-               3, source,
+               3, def,
+               4, source,
                // These are used to set combo box values when a list item is selected
-               4, s_track,
+               5, s_track,
                -1);
        gtk_tree_selection_select_iter(selection, &iter);
        g_free(s_track);
@@ -491,16 +593,12 @@ subtitle_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data
        {
                const gchar *track;
 
-               gtk_tree_model_get(store, &iter, 4, &track, -1);
+               gtk_tree_model_get(store, &iter, 5, &track, -1);
                ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track));
+
                widget = GHB_WIDGET (ud->builder, "subtitle_remove");
                gtk_widget_set_sensitive(widget, TRUE);
        }
-       else
-       {
-               widget = GHB_WIDGET (ud->builder, "subtitle_remove");
-               gtk_widget_set_sensitive(widget, FALSE);
-       }
 }
 
 G_MODULE_EXPORT void
@@ -508,42 +606,48 @@ subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        // Add the current subtitle settings to the list.
        GValue *settings;
-       GtkWidget *widget;
        gint count;
        GValue *subtitle_list;
        gboolean burned = FALSE;
        gint track;
        
        g_debug("subtitle_add_clicked_cb ()");
-       track = ghb_pick_subtitle_track(ud);
-       if (track < 0)
+       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+       if (subtitle_list == NULL)
+       {
+               subtitle_list = ghb_array_value_new(8);
+               ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
+       }
+       count = ghb_array_len(subtitle_list);
+       // Don't allow more than 99
+       // This is a had limit imposed by libhb/sync.c:GetFifoForId()
+       if (count >= 99)
                return;
 
+       track = ghb_settings_get_int(ud->settings, "SubtitleTrack");
+
        if (mustBurn(ud, track))
        {
                burned = TRUE;
        }
        settings = ghb_dict_value_new();
-       // Only allow up to 8 subtitle entries
-       widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
        ghb_settings_set_int(settings, "SubtitleTrack", track);
        ghb_settings_take_value(settings, "SubtitleForced", 
                                                        ghb_boolean_value_new(FALSE));
        ghb_settings_take_value(settings, "SubtitleBurned", 
                                                        ghb_boolean_value_new(burned));
+       ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
+                                                       ghb_boolean_value_new(FALSE));
 
-       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-       if (subtitle_list == NULL)
-       {
-               subtitle_list = ghb_array_value_new(8);
-               ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
-       }
        ghb_array_append(subtitle_list, settings);
        add_to_subtitle_list(ud, settings);
-       count = ghb_array_len(subtitle_list);
-       if (count >= 8)
+       if (burned)
+               ghb_subtitle_exclusive_burn(ud, count);
+       if (count == 98)
        {
-               gtk_widget_set_sensitive(xwidget, FALSE);
+               GtkWidget *widget;
+               widget = GHB_WIDGET (ud->builder, "subtitle_add");
+               gtk_widget_set_sensitive(widget, FALSE);
        }
 }
 
@@ -598,36 +702,67 @@ subtitle_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 void
-ghb_set_subtitle(signal_user_data_t *ud, GValue *settings)
+ghb_subtitle_prune(signal_user_data_t *ud)
 {
-       GtkWidget *button;
+       GtkTreeView  *tv;
+       GtkTreeModel *tm;
+       GtkTreeIter   ti;
+       GValue *subtitle_list, *settings;
+       gint count, ii, track;
+       gboolean burned;
+       gint first_track = 0, one_burned = 0;
+
+       subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+       if (subtitle_list == NULL)
+               return;
+       count = ghb_array_len(subtitle_list);
 
+       tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+       g_return_if_fail(tv != NULL);
+       tm = gtk_tree_view_get_model(tv);
+       for (ii = count-1; ii >= 0; ii--)
+       {
+               settings = ghb_array_get_nth(subtitle_list, ii);
+               burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
+               track = ghb_settings_combo_int(settings, "SubtitleTrack");
+               if (!burned && mustBurn(ud, track))
+               {
+                       gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+                       gtk_list_store_remove (GTK_LIST_STORE(tm), &ti);
+                       ghb_array_remove(subtitle_list, ii);
+               }
+               if (burned)
+               {
+                       first_track = ii;
+                       one_burned++;
+               }
+       }
+       if (one_burned)
+       {
+               ghb_subtitle_exclusive_burn(ud, first_track);
+       }
+}
+
+void
+ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings)
+{
        GValue *slist;
-       GValue *track, *subtitle;
-       //GValue *forced, *burned;
-       gint count, ii, i_track;
+       GValue *subtitle;
+       gint count, ii;
+       gint titleindex;
        
-       g_debug("set_subtitle");
-       // Clear the subtitle list
+       g_debug("ghb_reset_subtitles");
        ghb_clear_subtitle_list(ud);
-       button = GHB_WIDGET (ud->builder, "subtitle_add");
-       slist = ghb_settings_get_value(settings, "subtitle_list");
+       titleindex = ghb_settings_combo_int(ud->settings, "title");
+       if (titleindex < 0)
+               return;
 
+       slist = ghb_settings_get_value(settings, "subtitle_list");
        count = ghb_array_len(slist);
        for (ii = 0; ii < count; ii++)
        {
-               subtitle = ghb_array_get_nth(slist, ii);
-               track = ghb_settings_get_value(subtitle, "SubtitleTrack");
-               i_track = ghb_settings_get_int(subtitle, "SubtitleTrack");
-               //forced = ghb_settings_get_value(subtitle, "SubtitleForced");
-               //burned = ghb_settings_get_value(subtitle, "SubtitleBurned");
-
-               if (i_track != -2)
-               {
-                       // Add to subtitle list
-                       g_signal_emit_by_name(button, "clicked", ud);
-                       ghb_ui_update(ud, "AudioTrack", track);
-               }
+               subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii));
+               ghb_add_subtitle(ud, subtitle);
        }
 }