X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsubtitlehandler.c;h=fddb6a9fde08499e54072dfdf1f81a1a2517f07b;hb=18975efc39293ff43bc3b82c052ee661d810272c;hp=f26303925bb71e02fb35cd5d46bc780bb9931656;hpb=d40a191a9a2a0cae4d68a0648e31ed06c1f524f7;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index f2630392..fddb6a9f 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -39,23 +39,8 @@ 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) - { - 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; } @@ -82,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; @@ -94,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); @@ -151,13 +135,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) { @@ -198,7 +181,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 ()"); @@ -210,10 +192,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) { @@ -269,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); } } @@ -329,14 +311,18 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) 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, source, track_indices); + track = ghb_find_subtitle_track(titleindex, lang, burn, + force, source, track_indices); g_free(lang); if (track >= -1) { @@ -353,6 +339,7 @@ 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); @@ -366,12 +353,16 @@ ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud) GValue *settings; gboolean burn; - track = ghb_find_subtitle_track(titleindex, pref_lang, VOBSUB, 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", @@ -407,8 +398,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", @@ -546,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); @@ -570,18 +566,21 @@ 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); @@ -627,37 +626,20 @@ 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); - // allow only one default - ghb_subtitle_exclusive_default(ud, row); - ghb_live_reset(ud); -} - -static const char* -subtitle_source_name(gint source) -{ - const gchar * name; - switch (source) + if (active) { - case VOBSUB: - name = "Bitmap"; - break; - case CC708SUB: - case CC608SUB: - name = "Text"; - break; - case SRTSUB: - name = "SRT"; - break; - default: - name = "Unknown"; - break; + ghb_settings_set_boolean(settings, "SubtitleBurned", !active); + gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, !active, -1); } - return name; + // allow only one default + ghb_subtitle_exclusive_default(ud, row); + ghb_live_reset(ud); } static void @@ -672,6 +654,7 @@ 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")); @@ -688,7 +671,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)) @@ -715,8 +697,6 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) lang = ghb_settings_combo_option(settings, "SrtLanguage"); code = ghb_settings_get_string(settings, "SrtCodeset"); - track = g_strdup_printf("%s (%s)", lang, code); - g_free(code); s_track = ghb_settings_get_string(settings, "SrtFile"); if (g_file_test(s_track, G_FILE_TEST_IS_REGULAR)) @@ -724,13 +704,16 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) 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; @@ -740,24 +723,29 @@ subtitle_list_refresh_selected(signal_user_data_t *ud) { track = g_strdup( ghb_settings_combo_option(settings, "SubtitleTrack")); - source = g_strdup(subtitle_source_name(i_source)); + 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, - 5, offset, + 4, offset, // These are used to set combo box values when a list item is selected - 6, s_track, - 7, i_source, + 5, s_track, + 6, i_source, + 7, allow_burn_force, + 8, allow_burn_force, -1); g_free(track); g_free(source); @@ -773,7 +761,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) @@ -801,7 +789,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) @@ -818,8 +806,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) @@ -853,7 +841,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) @@ -904,6 +892,7 @@ add_to_subtitle_list( gboolean forced, burned, def; gchar *s_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")); @@ -917,7 +906,10 @@ add_to_subtitle_list( s_track = ghb_settings_get_string(settings, "SubtitleTrack"); i_source = ghb_settings_get_int(settings, "SubtitleSource"); - source = subtitle_source_name(i_source); + 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, @@ -926,13 +918,12 @@ 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 - 6, s_track, - 7, i_source, - 8, TRUE, - 9, TRUE, - 10, FALSE, + 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); @@ -959,7 +950,6 @@ add_to_srt_list( lang = ghb_settings_combo_option(settings, "SrtLanguage"); code = ghb_settings_get_string(settings, "SrtCodeset"); - track = g_strdup_printf("%s (%s)", lang, code); forced = FALSE; burned = FALSE; def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack"); @@ -970,11 +960,13 @@ add_to_srt_list( 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; @@ -987,14 +979,13 @@ add_to_srt_list( 1, forced, 2, burned, 3, def, - 4, source, - 5, offset, + 4, offset, // These are used to set combo box values when a list item is selected - 6, filename, - 7, i_source, + 5, filename, + 6, i_source, + 7, FALSE, 8, FALSE, - 9, FALSE, - 10, TRUE, + 9, TRUE, -1); gtk_tree_selection_select_iter(selection, &iter); g_free(code); @@ -1133,18 +1124,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"); @@ -1167,17 +1152,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", @@ -1261,27 +1249,21 @@ ghb_subtitle_prune(signal_user_data_t *ud) tm = gtk_tree_view_get_model(tv); for (ii = count-1; ii >= 0; ii--) { - gint source, track; gboolean burned; GValue *settings; settings = ghb_array_get_nth(subtitle_list, ii); burned = ghb_settings_get_boolean(settings, "SubtitleBurned"); - source = ghb_settings_get_int(settings, "SubtitleSource"); - if (source == VOBSUB) + if (!burned && mustBurn(ud, settings)) { - 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++; - } + 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) @@ -1308,8 +1290,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); } }