LinGui: add subtitle list to queue display

[handbrake-jp/handbrake-jp-git.git] / gtk / src / hb-backend.c

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 4a2589c..f15fe00 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1817,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, 
@@ -2363,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;
@@ -4178,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)