X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsubtitlehandler.c;h=b74eb27ea942e748556dc3a994c24d859eede0cd;hb=f99b82a5836b678aab5f4a755bf0b4c54b4e9f84;hp=c2bce5fc5457c1269a08b2471233f2ef71af47f9;hpb=46ede3975c1968c69fe3286518b8c97c65caecd6;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index c2bce5fc..b74eb27e 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -39,19 +39,31 @@ 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; - - mux = ghb_settings_combo_int(ud->settings, "FileFormat"); - if (mux == HB_MUX_MP4) + if (ghb_settings_combo_int(ud->settings, "FileFormat") == 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) + if (ghb_settings_get_int(settings, "SubtitleSource") == VOBSUB) + { + return TRUE; + } + } + return FALSE; +} + +gboolean +ghb_soft_in_subtitle_list(GValue *subtitle_list) +{ + gint count, ii; + GValue *settings; + + 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; } @@ -64,7 +76,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; @@ -76,14 +88,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); @@ -133,13 +144,12 @@ ghb_add_srt(signal_user_data_t *ud, GValue *settings) 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); - ghb_settings_set_int(settings, "SubtitleSource", SRTSUB); - subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); if (subtitle_list == NULL) { @@ -167,6 +177,7 @@ ghb_add_srt(signal_user_data_t *ud, GValue *settings) widget = GHB_WIDGET (ud->builder, "srt_add"); gtk_widget_set_sensitive(widget, FALSE); } + ghb_update_destination_extension(ud); ghb_live_reset(ud); } @@ -179,7 +190,6 @@ ghb_add_subtitle(signal_user_data_t *ud, GValue *settings) gboolean burned; const gchar *track; const gchar *lang; - gint tt, source; g_debug("ghb_add_subtitle ()"); @@ -191,10 +201,6 @@ ghb_add_subtitle(signal_user_data_t *ud, GValue *settings) lang = ghb_settings_combo_string(settings, "SubtitleTrack"); ghb_settings_set_string(settings, "SubtitleLanguage", lang); - tt = ghb_settings_get_int(settings, "SubtitleTrack"); - source = ghb_subtitle_track_source(ud, tt); - ghb_settings_set_int(settings, "SubtitleSource", source); - subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); if (subtitle_list == NULL) { @@ -225,6 +231,7 @@ ghb_add_subtitle(signal_user_data_t *ud, GValue *settings) widget = GHB_WIDGET (ud->builder, "srt_add"); gtk_widget_set_sensitive(widget, FALSE); } + ghb_update_destination_extension(ud); ghb_live_reset(ud); } @@ -249,8 +256,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); } } @@ -308,16 +319,22 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) 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) { - gint source; GValue *dup = ghb_value_dup(subtitle); lang = ghb_subtitle_track_lang(ud, track); ghb_settings_set_int(dup, "SubtitleTrack", track); @@ -331,12 +348,13 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) 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); } - g_free(lang); } if (foreign_lang_index < 0 && pref_lang != NULL) { @@ -344,12 +362,16 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) GValue *settings; gboolean burn; - track = ghb_find_subtitle_track(titleindex, pref_lang, track_indices); + track = ghb_find_subtitle_track(titleindex, pref_lang, FALSE, FALSE, VOBSUB, track_indices); if (track >= -1) { - burn = mustBurn(ud, track); + 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", @@ -385,8 +407,12 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) 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", @@ -524,8 +550,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); @@ -548,21 +575,25 @@ subtitle_burned_toggled_cb( return; settings = ghb_array_get_nth(subtitle_list, row); - source = ghb_settings_get_int(settings, "SubtitleSource"); if (source != VOBSUB) return; - - track = ghb_settings_combo_int(settings, "SubtitleTrack"); - 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); } @@ -604,10 +635,17 @@ subtitle_default_toggled_cb( return; settings = ghb_array_get_nth(subtitle_list, row); + 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); @@ -665,7 +703,6 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) 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)) @@ -750,7 +787,7 @@ 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) @@ -759,7 +796,6 @@ subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud) gint tt, source; ghb_widget_to_setting(settings, widget); - subtitle_list_refresh_selected(ud); track = ghb_settings_combo_option(settings, "SubtitleTrack"); ghb_settings_set_string(settings, "SubtitleTrackDescription", track); tt = ghb_settings_get_int(settings, "SubtitleTrack"); @@ -767,6 +803,7 @@ subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud) 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); @@ -778,7 +815,7 @@ srt_changed_cb(GtkWidget *widget, signal_user_data_t *ud) GValue *settings; g_debug("srt_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) @@ -795,8 +832,8 @@ srt_file_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { GValue *settings; - g_debug("srt_changed_cb ()"); - ghb_check_dependency(ud, widget); + 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) @@ -830,7 +867,7 @@ srt_lang_changed_cb(GtkWidget *widget, signal_user_data_t *ud) GValue *settings; g_debug("srt_lang_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) @@ -1110,18 +1147,12 @@ srt_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { // Add the current subtitle settings to the list. GValue *settings; - gboolean burned = FALSE; - gint track; gchar *dir, *filename; g_debug("subtitle_add_clicked_cb ()"); - track = ghb_settings_get_int(ud->settings, "SubtitleTrack"); - if (mustBurn(ud, track)) - { - burned = TRUE; - } settings = ghb_dict_value_new(); + ghb_settings_set_int(settings, "SubtitleSource", SRTSUB); ghb_settings_set_string(settings, "SrtLanguage", "und"); ghb_settings_set_string(settings, "SrtCodeset", "UTF-8"); @@ -1144,17 +1175,20 @@ subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) // Add the current subtitle settings to the list. GValue *settings; gboolean burned = FALSE; - gint track; + gint track, source; g_debug("subtitle_add_clicked_cb ()"); 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", @@ -1224,9 +1258,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"); @@ -1239,10 +1272,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); @@ -1278,8 +1313,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); } }