X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsubtitlehandler.c;h=a7f06712adae94662b1a4e7d8a521276235b8b3c;hb=171133dcfae99e74f288cf11bfee14bf50ab14ef;hp=c5d44eb1257c75855a48fe0701eb89ac8b0d4afc;hpb=fa5de45383d021a1e3c4095a4034ea905ac083ce;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index c5d44eb1..a7f06712 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -19,9 +19,11 @@ #include "callbacks.h" #include "preview.h" #include "presets.h" +#include "audiohandler.h" #include "subtitlehandler.h" static void add_to_subtitle_list(signal_user_data_t *ud, GValue *settings); +static void add_to_srt_list(signal_user_data_t *ud, GValue *settings); static void free_subtitle_index_list(gpointer data) @@ -37,19 +39,22 @@ free_subtitle_key(gpointer data) } static gboolean -mustBurn(signal_user_data_t *ud, gint track) +mustBurn(signal_user_data_t *ud, GValue *settings) { - gint mux; + return FALSE; +} - mux = ghb_settings_combo_int(ud->settings, "FileFormat"); - if (mux == HB_MUX_MP4) - { - gint source; +gboolean +ghb_soft_in_subtitle_list(GValue *subtitle_list) +{ + gint count, ii; + GValue *settings; - // 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) + count = ghb_array_len(subtitle_list); + for (ii = 0; ii < count; ii++) + { + settings = ghb_array_get_nth(subtitle_list, ii); + if (!ghb_settings_get_boolean(settings, "SubtitleBurned")) { return TRUE; } @@ -62,7 +67,7 @@ ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index) { GValue *subtitle_list; GValue *settings; - gint ii, count, tt; + gint ii, count; GtkTreeView *tv; GtkTreeModel *tm; GtkTreeIter ti; @@ -74,14 +79,13 @@ ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index) 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)) + if (burned && ii != index && !mustBurn(ud, settings)) { ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE); gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, FALSE, -1); @@ -122,16 +126,72 @@ ghb_subtitle_exclusive_default(signal_user_data_t *ud, gint index) } void +ghb_add_srt(signal_user_data_t *ud, GValue *settings) +{ + // Add the current subtitle settings to the list. + GValue *subtitle_list; + gint count; + const gchar *lang; + + g_debug("ghb_add_srt ()"); + + ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE); + // Add the long track description so the queue can access it + // when a different title is selected. + lang = ghb_settings_combo_option(settings, "SrtLanguage"); + ghb_settings_set_string(settings, "SubtitleTrackDescription", lang); + + 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) + { + ghb_value_free(settings); + return; + } + + ghb_array_append(subtitle_list, settings); + add_to_srt_list(ud, settings); + + if (count == 98) + { + GtkWidget *widget; + widget = GHB_WIDGET (ud->builder, "subtitle_add"); + gtk_widget_set_sensitive(widget, FALSE); + widget = GHB_WIDGET (ud->builder, "srt_add"); + gtk_widget_set_sensitive(widget, FALSE); + } + ghb_update_destination_extension(ud); + ghb_live_reset(ud); +} + +void ghb_add_subtitle(signal_user_data_t *ud, GValue *settings) { // Add the current subtitle settings to the list. GValue *subtitle_list; gint count; gboolean burned; + const gchar *track; + const gchar *lang; g_debug("ghb_add_subtitle ()"); - // Only allow up to 8 subtitle entries + // Add the long track description so the queue can access it + // when a different title is selected. + track = ghb_settings_combo_option(settings, "SubtitleTrack"); + ghb_settings_set_string(settings, "SubtitleTrackDescription", track); + + lang = ghb_settings_combo_string(settings, "SubtitleTrack"); + ghb_settings_set_string(settings, "SubtitleLanguage", lang); + subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); if (subtitle_list == NULL) { @@ -139,12 +199,31 @@ ghb_add_subtitle(signal_user_data_t *ud, GValue *settings) 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) + { + ghb_value_free(settings); + return; + } + ghb_array_append(subtitle_list, settings); add_to_subtitle_list(ud, settings); burned = ghb_settings_get_boolean(settings, "SubtitleBurned"); if (burned) ghb_subtitle_exclusive_burn(ud, count); + if (count == 98) + { + GtkWidget *widget; + widget = GHB_WIDGET (ud->builder, "subtitle_add"); + gtk_widget_set_sensitive(widget, FALSE); + widget = GHB_WIDGET (ud->builder, "srt_add"); + gtk_widget_set_sensitive(widget, FALSE); + } + ghb_update_destination_extension(ud); + ghb_live_reset(ud); } static void @@ -168,8 +247,12 @@ add_all_pref_subtitles(signal_user_data_t *ud) g_free(lang); if (track >= -1) { + int source; + // Add to subtitle list ghb_settings_set_int(subtitle, "SubtitleTrack", track); + source = ghb_subtitle_track_source(ud, track); + ghb_settings_set_int(subtitle, "SubtitleSource", source); ghb_add_subtitle(ud, subtitle); } } @@ -180,13 +263,33 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) { gint track; GHashTable *track_indices; - char *lang; + gchar *lang, *pref_lang = NULL; + gchar *audio_lang; + gint foreign_lang_index = -1; + gboolean found_cc = FALSE; const GValue *pref_subtitle; GValue *subtitle; - gint count, ii; + gint count, ii, jj; g_debug("ghb_set_pref_subtitle %d", titleindex); + + // Check to see if we need to add a subtitle track for foreign audio + // language films. A subtitle track will be added if: + // + // The first (default) audio track language does NOT match the users + // chosen Preferred Language AND the Preferred Language is NOT Any (und). + // + audio_lang = ghb_get_user_audio_lang(ud, titleindex, 0); + pref_lang = ghb_settings_get_string(ud->settings, "PreferredLanguage"); + + if (audio_lang != NULL && pref_lang != NULL && + (strcmp(audio_lang, pref_lang) == 0 || strcmp("und", pref_lang) == 0)) + { + g_free(pref_lang); + pref_lang = NULL; + } + track_indices = g_hash_table_new_full(g_str_hash, g_str_equal, free_subtitle_key, free_subtitle_index_list); @@ -204,22 +307,118 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList"); count = ghb_array_len(pref_subtitle); + jj = 0; for (ii = 0; ii < count; ii++) { + gint source; + gboolean force, burn; + subtitle = ghb_array_get_nth(pref_subtitle, ii); lang = ghb_settings_get_string(subtitle, "SubtitleLanguage"); + source = ghb_settings_get_int(subtitle, "SubtitleSource"); + burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned"); + force = ghb_settings_get_boolean(subtitle, "SubtitleForced"); // 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); + track = ghb_find_subtitle_track(titleindex, lang, burn, + force, source, track_indices); g_free(lang); if (track >= -1) { GValue *dup = ghb_value_dup(subtitle); + lang = ghb_subtitle_track_lang(ud, track); ghb_settings_set_int(dup, "SubtitleTrack", track); + if (foreign_lang_index < 0 && pref_lang != NULL && + strcmp(lang, pref_lang) == 0) + { + foreign_lang_index = jj; + ghb_settings_take_value(dup, "SubtitleForced", + ghb_boolean_value_new(FALSE)); + ghb_settings_take_value(dup, "SubtitleDefaultTrack", + ghb_boolean_value_new(TRUE)); + } + source = ghb_subtitle_track_source(ud, track); + ghb_settings_set_int(dup, "SubtitleSource", source); + if (source == CC608SUB || source == CC708SUB) + found_cc = TRUE; ghb_add_subtitle(ud, dup); + jj++; + g_free(lang); + } + } + if (foreign_lang_index < 0 && pref_lang != NULL) + { + // Subtitle for foreign language audio not added yet + GValue *settings; + gboolean burn; + + track = ghb_find_subtitle_track(titleindex, pref_lang, FALSE, FALSE, VOBSUB, track_indices); + if (track >= -1) + { + int source; + + settings = ghb_dict_value_new(); + ghb_settings_set_int(settings, "SubtitleTrack", track); + source = ghb_subtitle_track_source(ud, track); + ghb_settings_set_int(settings, "SubtitleSource", source); + burn = mustBurn(ud, settings); + ghb_settings_take_value(settings, "SubtitleForced", + ghb_boolean_value_new(FALSE)); + ghb_settings_take_value(settings, "SubtitleBurned", + ghb_boolean_value_new(burn)); + ghb_settings_take_value(settings, "SubtitleDefaultTrack", + ghb_boolean_value_new(TRUE)); + + ghb_add_subtitle(ud, settings); + foreign_lang_index = jj; + } + } + if (foreign_lang_index >= 0) + { + GValue *subtitle_list; + gboolean burn, def; + + subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); + subtitle = ghb_array_get_nth(subtitle_list, foreign_lang_index); + + burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned"); + def = ghb_settings_get_boolean(subtitle, "SubtitleDefaultTrack"); + if (burn) + ghb_subtitle_exclusive_burn(ud, foreign_lang_index); + if (def) + ghb_subtitle_exclusive_default(ud, foreign_lang_index); + ghb_log("adding subtitle for foreign language audio: %s", audio_lang); + } + if (ghb_settings_get_boolean(ud->settings, "AddCC") && !found_cc) + { + // Subtitle for foreign language audio not added yet + GValue *settings; + + track = ghb_find_cc_track(titleindex); + if (track >= 0) + { + int source; + + settings = ghb_dict_value_new(); + ghb_settings_set_int(settings, "SubtitleTrack", track); + source = ghb_subtitle_track_source(ud, track); + ghb_settings_set_int(settings, "SubtitleSource", source); + ghb_settings_take_value(settings, "SubtitleForced", + ghb_boolean_value_new(FALSE)); + ghb_settings_take_value(settings, "SubtitleBurned", + ghb_boolean_value_new(FALSE)); + ghb_settings_take_value(settings, "SubtitleDefaultTrack", + ghb_boolean_value_new(FALSE)); + + ghb_add_subtitle(ud, settings); + ghb_log("adding Closed Captions: %s", audio_lang); } } + if (pref_lang != NULL) + g_free(pref_lang); + if (audio_lang != NULL) + g_free(audio_lang); g_hash_table_destroy(track_indices); } @@ -295,7 +494,7 @@ subtitle_forced_toggled_cb( GtkTreePath *tp; gint *indices; GValue *subtitle_list, *settings; - gint source, track; + gint source; g_debug("forced toggled"); tp = gtk_tree_path_new_from_string (path); @@ -318,14 +517,14 @@ subtitle_forced_toggled_cb( return; settings = ghb_array_get_nth(subtitle_list, row); - track = ghb_settings_combo_int(settings, "SubtitleTrack"); - source = ghb_subtitle_track_source(ud, track); + source = ghb_settings_get_int(settings, "SubtitleSource"); if (source != VOBSUB) return; ghb_settings_set_boolean(settings, "SubtitleForced", active); gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1); + ghb_live_reset(ud); } G_MODULE_EXPORT void @@ -342,8 +541,9 @@ subtitle_burned_toggled_cb( gint row; gint *indices; GValue *subtitle_list; - gint count, track, source; + gint count; GValue *settings; + gint source; g_debug("burned toggled"); tp = gtk_tree_path_new_from_string (path); @@ -366,21 +566,26 @@ subtitle_burned_toggled_cb( return; settings = ghb_array_get_nth(subtitle_list, row); - track = ghb_settings_combo_int(settings, "SubtitleTrack"); - - source = ghb_subtitle_track_source(ud, track); + source = ghb_settings_get_int(settings, "SubtitleSource"); if (source != VOBSUB) return; - - if (!active && mustBurn(ud, track)) + if (!active && mustBurn(ud, settings)) return; ghb_settings_set_boolean(settings, "SubtitleBurned", active); - gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, active, -1); + + if (active) + { + ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", !active); + gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, !active, -1); + } + // Unburn the rest if (active) ghb_subtitle_exclusive_burn(ud, row); + ghb_update_destination_extension(ud); + ghb_live_reset(ud); } G_MODULE_EXPORT void @@ -397,7 +602,7 @@ subtitle_default_toggled_cb( gint row; gint *indices; GValue *subtitle_list; - gint count, track; + gint count; GValue *settings; g_debug("default toggled"); @@ -421,13 +626,20 @@ subtitle_default_toggled_cb( return; settings = ghb_array_get_nth(subtitle_list, row); - track = ghb_settings_combo_int(settings, "SubtitleTrack"); + if (active && mustBurn(ud, settings)) + return; ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", active); - gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, active, -1); + + if (active) + { + ghb_settings_set_boolean(settings, "SubtitleBurned", !active); + gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, !active, -1); + } // allow only one default ghb_subtitle_exclusive_default(ud, row); + ghb_live_reset(ud); } static void @@ -442,40 +654,33 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) gint row; GValue *settings = NULL; const GValue *subtitle_list; + gboolean allow_burn_force = FALSE; 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; + gchar *track, *source; gboolean forced, burned, def; gchar *s_track; - gint i_track; + gint offset = 0; // 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); + i_source = ghb_settings_get_int(settings, "SubtitleSource"); if (i_source != VOBSUB) { // Force and burn only apply to VOBSUBS @@ -485,16 +690,65 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) ghb_settings_set_boolean(settings, "SubtitleBurned", burned); } + if (i_source == SRTSUB) + { + const gchar *lang; + gchar *code; + + lang = ghb_settings_combo_option(settings, "SrtLanguage"); + code = ghb_settings_get_string(settings, "SrtCodeset"); + + s_track = ghb_settings_get_string(settings, "SrtFile"); + if (g_file_test(s_track, G_FILE_TEST_IS_REGULAR)) + { + gchar *basename; + + basename = g_path_get_basename(s_track); + track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename); + source = g_strdup_printf("SRT (%s)", basename); + g_free(basename); + } + else + { + track = g_strdup_printf("%s (%s)(SRT)", lang, code); + source = g_strdup_printf("SRT (none)"); + } + g_free(code); + offset = ghb_settings_get_int(settings, "SrtOffset"); + + forced = FALSE; + burned = FALSE; + } + else + { + track = g_strdup( + ghb_settings_combo_option(settings, "SubtitleTrack")); + source = g_strdup(ghb_subtitle_source_name(i_source)); + s_track = ghb_settings_get_string(settings, "SubtitleTrack"); + + forced = ghb_settings_get_boolean(settings, "SubtitleForced"); + burned = ghb_settings_get_boolean(settings, "SubtitleBurned"); + } + + if (i_source == VOBSUB) + allow_burn_force = TRUE; + + gtk_list_store_set(GTK_LIST_STORE(store), &iter, // These are displayed in list 0, track, 1, forced, 2, burned, 3, def, - 4, source, + 4, offset, // These are used to set combo box values when a list item is selected 5, s_track, + 6, i_source, + 7, allow_burn_force, + 8, allow_burn_force, -1); + g_free(track); + g_free(source); g_free(s_track); if (burned) ghb_subtitle_exclusive_burn(ud, row); @@ -507,16 +761,103 @@ subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud) GValue *settings; g_debug("subtitle_track_changed_cb ()"); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); + ghb_widget_to_setting(ud->settings, widget); settings = ghb_selected_subtitle_settings(ud); if (settings != NULL) { + const gchar *track, *lang; + gint tt, source; + ghb_widget_to_setting(settings, widget); + track = ghb_settings_combo_option(settings, "SubtitleTrack"); + ghb_settings_set_string(settings, "SubtitleTrackDescription", track); + tt = ghb_settings_get_int(settings, "SubtitleTrack"); + source = ghb_subtitle_track_source(ud, tt); + ghb_settings_set_int(settings, "SubtitleSource", source); + lang = ghb_settings_combo_string(settings, "SubtitleTrack"); + ghb_settings_set_string(settings, "SubtitleLanguage", lang); subtitle_list_refresh_selected(ud); + ghb_live_reset(ud); } ghb_live_reset(ud); } +G_MODULE_EXPORT void +srt_changed_cb(GtkWidget *widget, signal_user_data_t *ud) +{ + GValue *settings; + + g_debug("srt_changed_cb ()"); + ghb_check_dependency(ud, widget, NULL); + ghb_widget_to_setting(ud->settings, widget); + settings = ghb_selected_subtitle_settings(ud); + if (settings != NULL) + { + ghb_widget_to_setting(settings, widget); + subtitle_list_refresh_selected(ud); + + ghb_live_reset(ud); + } +} + +G_MODULE_EXPORT void +srt_file_changed_cb(GtkWidget *widget, signal_user_data_t *ud) +{ + GValue *settings; + + g_debug("srt_file_changed_cb ()"); + ghb_check_dependency(ud, widget, NULL); + ghb_widget_to_setting(ud->settings, widget); + settings = ghb_selected_subtitle_settings(ud); + if (settings != NULL) + { + gchar *filename, *dirname; + + ghb_widget_to_setting(settings, widget); + subtitle_list_refresh_selected(ud); + + ghb_live_reset(ud); + + filename = ghb_settings_get_string(settings, "SrtFile"); + if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + { + ghb_settings_set_string(ud->settings, "SrtDir", filename); + } + else + { + dirname = g_path_get_dirname(filename); + ghb_settings_set_string(ud->settings, "SrtDir", dirname); + g_free(dirname); + } + ghb_pref_save(ud->settings, "SrtDir"); + g_free(filename); + } +} + +G_MODULE_EXPORT void +srt_lang_changed_cb(GtkWidget *widget, signal_user_data_t *ud) +{ + GValue *settings; + + g_debug("srt_lang_changed_cb ()"); + ghb_check_dependency(ud, widget, NULL); + ghb_widget_to_setting(ud->settings, widget); + settings = ghb_selected_subtitle_settings(ud); + if (settings != NULL) + { + const gchar *lang; + + ghb_widget_to_setting(settings, widget); + subtitle_list_refresh_selected(ud); + + ghb_live_reset(ud); + + lang = ghb_settings_combo_option(settings, "SrtLanguage"); + ghb_settings_set_string(settings, "SubtitleTrackDescription", lang); + } +} + void ghb_clear_subtitle_list(signal_user_data_t *ud) { @@ -550,7 +891,8 @@ add_to_subtitle_list( const gchar *track, *source; gboolean forced, burned, def; gchar *s_track; - gint i_track; + gint i_source; + gboolean allow_burn_force = FALSE; g_debug("add_to_subtitle_list ()"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list")); @@ -563,8 +905,11 @@ add_to_subtitle_list( 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); + i_source = ghb_settings_get_int(settings, "SubtitleSource"); + source = ghb_subtitle_source_name(i_source); + + if (i_source == VOBSUB) + allow_burn_force = TRUE; gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, @@ -573,14 +918,82 @@ add_to_subtitle_list( 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, + 6, i_source, + 7, allow_burn_force, + 8, allow_burn_force, + 9, FALSE, -1); gtk_tree_selection_select_iter(selection, &iter); g_free(s_track); } +static void +add_to_srt_list( + signal_user_data_t *ud, + GValue *settings) +{ + GtkTreeView *treeview; + GtkTreeIter iter; + GtkListStore *store; + GtkTreeSelection *selection; + const gchar *lang; + gboolean forced, burned, def; + gchar *filename, *code, *track, *source; + gint i_source, offset; + + g_debug("add_to_srt_list ()"); + treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list")); + selection = gtk_tree_view_get_selection (treeview); + store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview)); + + lang = ghb_settings_combo_option(settings, "SrtLanguage"); + code = ghb_settings_get_string(settings, "SrtCodeset"); + forced = FALSE; + burned = FALSE; + def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack"); + + filename = ghb_settings_get_string(settings, "SrtFile"); + if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) + { + gchar *basename; + + basename = g_path_get_basename(filename); + track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename); + source = g_strdup_printf("SRT (%s)", basename); + g_free(basename); + } + else + { + track = g_strdup_printf("%s (%s)(SRT)", lang, code); + source = g_strdup_printf("SRT (none)"); + } + i_source = SRTSUB; + offset = ghb_settings_get_int(settings, "SrtOffset"); + + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, + // These are displayed in list + 0, track, + 1, forced, + 2, burned, + 3, def, + 4, offset, + // These are used to set combo box values when a list item is selected + 5, filename, + 6, i_source, + 7, FALSE, + 8, FALSE, + 9, TRUE, + -1); + gtk_tree_selection_select_iter(selection, &iter); + g_free(code); + g_free(track); + g_free(filename); + g_free(source); +} + G_MODULE_EXPORT void subtitle_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud) { @@ -591,14 +1004,148 @@ subtitle_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data g_debug("subtitle_list_selection_changed_cb ()"); if (gtk_tree_selection_get_selected(selection, &store, &iter)) { - const gchar *track; + gint source; + GtkTreePath *treepath; + gint *indices, row; + GValue *subtitle_list, *settings; - gtk_tree_model_get(store, &iter, 5, &track, -1); - ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track)); + treepath = gtk_tree_model_get_path (store, &iter); + indices = gtk_tree_path_get_indices (treepath); + row = indices[0]; + gtk_tree_path_free(treepath); + 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); + + source = ghb_settings_get_int(settings, "SubtitleSource"); + if (source == SRTSUB) + { + gchar *str; + gint offset; + + str = ghb_settings_get_string(settings, "SrtLanguage"); + ghb_ui_update(ud, "SrtLanguage", ghb_string_value(str)); + g_free(str); + + str = ghb_settings_get_string(settings, "SrtCodeset"); + ghb_ui_update(ud, "SrtCodeset", ghb_string_value(str)); + g_free(str); + + str = ghb_settings_get_string(settings, "SrtFile"); + ghb_ui_update(ud, "SrtFile", ghb_string_value(str)); + g_free(str); + + offset = ghb_settings_get_int(settings, "SrtOffset"); + ghb_ui_update(ud, "SrtOffset", ghb_int_value(offset)); + + widget = GHB_WIDGET(ud->builder, "subtitle_track_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SubtitleTrack"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_lang_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "srt_code_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "srt_file_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "srt_offset_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SrtLanguage"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SrtCodeset"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SrtFile"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SrtOffset"); + gtk_widget_show(widget); + } + else + { + gchar *track; + + track = ghb_settings_get_string(settings, "SubtitleTrack"); + ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track)); + g_free(track); + + widget = GHB_WIDGET(ud->builder, "srt_lang_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_code_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_file_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_offset_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtLanguage"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtCodeset"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtFile"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtOffset"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "subtitle_track_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SubtitleTrack"); + gtk_widget_show(widget); + } widget = GHB_WIDGET (ud->builder, "subtitle_remove"); gtk_widget_set_sensitive(widget, TRUE); } + else + { + widget = GHB_WIDGET(ud->builder, "srt_lang_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_code_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_file_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "srt_offset_label"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtLanguage"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtCodeset"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtFile"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "SrtOffset"); + gtk_widget_hide(widget); + widget = GHB_WIDGET(ud->builder, "subtitle_track_label"); + gtk_widget_show(widget); + widget = GHB_WIDGET(ud->builder, "SubtitleTrack"); + gtk_widget_show(widget); + } +} + +G_MODULE_EXPORT void +srt_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) +{ + // Add the current subtitle settings to the list. + GValue *settings; + gchar *dir, *filename, *lang; + + g_debug("subtitle_add_clicked_cb ()"); + + settings = ghb_dict_value_new(); + ghb_settings_set_int(settings, "SubtitleSource", SRTSUB); + lang = ghb_settings_get_string(ud->settings, "PreferredLanguage"); + ghb_settings_set_string(settings, "SrtLanguage", lang); + g_free(lang); + ghb_settings_set_string(settings, "SrtCodeset", "UTF-8"); + + dir = ghb_settings_get_string(ud->settings, "SrtDir"); + filename = g_strdup_printf("%s/none", dir); + ghb_settings_set_string(settings, "SrtFile", filename); + g_free(dir); + g_free(filename); + + ghb_settings_set_int(settings, "SrtOffset", 0); + ghb_settings_take_value(settings, "SubtitleDefaultTrack", + ghb_boolean_value_new(FALSE)); + + ghb_add_srt(ud, settings); } G_MODULE_EXPORT void @@ -606,32 +1153,21 @@ subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { // Add the current subtitle settings to the list. GValue *settings; - gint count; - GValue *subtitle_list; gboolean burned = FALSE; - gint track; + gint track, source; g_debug("subtitle_add_clicked_cb ()"); - 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)) + settings = ghb_dict_value_new(); + ghb_settings_set_int(settings, "SubtitleTrack", track); + source = ghb_subtitle_track_source(ud, track); + ghb_settings_set_int(settings, "SubtitleSource", source); + if (mustBurn(ud, settings)) { burned = TRUE; } - settings = ghb_dict_value_new(); - ghb_settings_set_int(settings, "SubtitleTrack", track); ghb_settings_take_value(settings, "SubtitleForced", ghb_boolean_value_new(FALSE)); ghb_settings_take_value(settings, "SubtitleBurned", @@ -639,16 +1175,7 @@ subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) ghb_settings_take_value(settings, "SubtitleDefaultTrack", ghb_boolean_value_new(FALSE)); - ghb_array_append(subtitle_list, settings); - add_to_subtitle_list(ud, settings); - if (burned) - ghb_subtitle_exclusive_burn(ud, count); - if (count == 98) - { - GtkWidget *widget; - widget = GHB_WIDGET (ud->builder, "subtitle_add"); - gtk_widget_set_sensitive(widget, FALSE); - } + ghb_add_subtitle(ud, settings); } G_MODULE_EXPORT void @@ -692,12 +1219,15 @@ subtitle_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud) if (row < 0) return; widget = GHB_WIDGET (ud->builder, "subtitle_add"); gtk_widget_set_sensitive(widget, TRUE); + widget = GHB_WIDGET (ud->builder, "srt_add"); + gtk_widget_set_sensitive(widget, TRUE); subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); if (row >= ghb_array_len(subtitle_list)) return; GValue *old = ghb_array_get_nth(subtitle_list, row); ghb_value_free(old); ghb_array_remove(subtitle_list, row); + ghb_live_reset(ud); } } @@ -707,9 +1237,8 @@ ghb_subtitle_prune(signal_user_data_t *ud) GtkTreeView *tv; GtkTreeModel *tm; GtkTreeIter ti; - GValue *subtitle_list, *settings; - gint count, ii, track; - gboolean burned; + GValue *subtitle_list; + gint count, ii; gint first_track = 0, one_burned = 0; subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); @@ -722,10 +1251,12 @@ ghb_subtitle_prune(signal_user_data_t *ud) tm = gtk_tree_view_get_model(tv); for (ii = count-1; ii >= 0; ii--) { + gboolean burned; + GValue *settings; + 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)) + if (!burned && mustBurn(ud, settings)) { gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii); gtk_list_store_remove (GTK_LIST_STORE(tm), &ti); @@ -761,8 +1292,14 @@ ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings) count = ghb_array_len(slist); for (ii = 0; ii < count; ii++) { + int source; + subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii)); - ghb_add_subtitle(ud, subtitle); + source = ghb_settings_get_int(subtitle, "SubtitleSource"); + if (source == SRTSUB) + ghb_add_srt(ud, subtitle); + else + ghb_add_subtitle(ud, subtitle); } }