X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fhb-backend.c;h=f15fe0081c5a7ac09173e275b1d370d744e13334;hb=023bc0f853674db16682807936aabf77139c1bb7;hp=ed0d54db0eeda358ab3ea4a79172a77ded2d5fea;hpb=676a138d73d591a7b892e0e59e30e45acdb10256;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index ed0d54db..f15fe008 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -107,6 +107,19 @@ combo_opts_t logging_opts =
 	d_logging_opts
 };
 
+static options_map_t d_appcast_update_opts[] =
+{
+	{"Never", "never", 0, "never"},
+	{"Daily", "daily", 1, "daily"},
+	{"Weekly", "weekly", 2, "weekly"},
+	{"Monthly", "monthly", 3, "monthly"},
+};
+combo_opts_t appcast_update_opts =
+{
+	sizeof(d_appcast_update_opts)/sizeof(options_map_t),
+	d_appcast_update_opts
+};
+
 static options_map_t d_vqual_granularity_opts[] =
 {
 	{"0.2",  "0.2",  0.2,  "0.2"},
@@ -322,6 +335,7 @@ combo_name_map_t combo_name_map[] =
 	{"PicturePAR", &par_opts},
 	{"PictureModulus", &alignment_opts},
 	{"LoggingLevel", &logging_opts},
+	{"check_updates", &appcast_update_opts},
 	{"VideoQualityGranularity", &vqual_granularity_opts},
 	{"FileFormat", &container_opts},
 	{"PictureDeinterlace", &deint_opts},
@@ -1803,6 +1817,32 @@ ghb_longest_title()
 	return titleindex;
 }
 
+gchar*
+ghb_get_source_audio_lang(gint titleindex, gint track)
+{
+	hb_list_t  * list;
+	hb_title_t * title;
+    hb_audio_config_t * audio;
+	gchar *lang = NULL;
+	
+	g_debug("ghb_lookup_1st_audio_lang ()\n");
+	if (h_scan == NULL) 
+		return NULL;
+	list = hb_get_titles( h_scan );
+    title = (hb_title_t*)hb_list_item( list, titleindex );
+	if (title == NULL)
+		return NULL;
+	if (hb_list_count( title->list_audio ) <= track)
+		return NULL;
+
+	audio = hb_list_audio_config_item(title->list_audio, track);
+	if (audio == NULL)
+		return NULL;
+
+	lang = g_strdup(audio->lang.iso639_2);
+	return lang;
+}
+
 gint
 ghb_find_audio_track(
 	gint titleindex, 
@@ -2196,6 +2236,7 @@ ghb_update_ui_combo_box(
 		generic_opts_set(ud->builder, "PicturePAR", &par_opts);
 		generic_opts_set(ud->builder, "PictureModulus", &alignment_opts);
 		generic_opts_set(ud->builder, "LoggingLevel", &logging_opts);
+		generic_opts_set(ud->builder, "check_updates", &appcast_update_opts);
 		generic_opts_set(ud->builder, "FileFormat", &container_opts);
 		generic_opts_set(ud->builder, "PictureDeinterlace", &deint_opts);
 		generic_opts_set(ud->builder, "PictureDetelecine", &detel_opts);
@@ -2348,7 +2389,7 @@ ghb_ac3_in_audio_list(const GValue *audio_list)
 
 		asettings = ghb_array_get_nth(audio_list, ii);
 		acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
-		if (acodec == HB_ACODEC_AC3)
+		if (acodec & HB_ACODEC_AC3)
 			return TRUE;
 	}
 	return FALSE;
@@ -4163,6 +4204,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 
 			job->x264opts = tmp_x264opts;
 		}
+		else
+		{
+			job->x264opts = x264opts;
+		}
 		job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
 		hb_add( h, job );
 		//if (job->x264opts != NULL)