LinGui: preference improvements

[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 ed0d54d..83877da 100644 (file)
--- 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, 
@@ -2072,7 +2112,7 @@ ghb_lookup_combo_int(const gchar *name, const GValue *gval)
                return lookup_video_rate_int(gval);
        else if (strcmp(name, "AudioMixdown") == 0)
                return lookup_mix_int(gval);
-       else if (strcmp(name, "SourceAudioLang") == 0)
+       else if (strcmp(name, "PreferredLanguage") == 0)
                return lookup_audio_lang_int(gval);
        else
        {
@@ -2095,7 +2135,7 @@ ghb_lookup_combo_double(const gchar *name, const GValue *gval)
                return lookup_video_rate_int(gval);
        else if (strcmp(name, "AudioMixdown") == 0)
                return lookup_mix_int(gval);
-       else if (strcmp(name, "SourceAudioLang") == 0)
+       else if (strcmp(name, "PreferredLanguage") == 0)
                return lookup_audio_lang_int(gval);
        else
        {
@@ -2118,7 +2158,7 @@ ghb_lookup_combo_option(const gchar *name, const GValue *gval)
                return lookup_video_rate_option(gval);
        else if (strcmp(name, "AudioMixdown") == 0)
                return lookup_mix_option(gval);
-       else if (strcmp(name, "SourceAudioLang") == 0)
+       else if (strcmp(name, "PreferredLanguage") == 0)
                return lookup_audio_lang_option(gval);
        else
        {
@@ -2141,7 +2181,7 @@ ghb_lookup_combo_string(const gchar *name, const GValue *gval)
                return lookup_video_rate_option(gval);
        else if (strcmp(name, "AudioMixdown") == 0)
                return lookup_mix_option(gval);
-       else if (strcmp(name, "SourceAudioLang") == 0)
+       else if (strcmp(name, "PreferredLanguage") == 0)
                return lookup_audio_lang_option(gval);
        else
        {
@@ -2188,7 +2228,7 @@ ghb_update_ui_combo_box(
                audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
                video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
                mix_opts_set(ud->builder, "AudioMixdown");
-               language_opts_set(ud->builder, "SourceAudioLang");
+               language_opts_set(ud->builder, "PreferredLanguage");
                title_opts_set(ud->builder, "title");
                audio_track_opts_set(ud->builder, "AudioTrack", user_data);
                subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
@@ -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);
@@ -2220,8 +2261,8 @@ ghb_update_ui_combo_box(
                        video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
                else if (strcmp(name, "AudioMixdown") == 0)
                        mix_opts_set(ud->builder, "AudioMixdown");
-               else if (strcmp(name, "SourceAudioLang") == 0)
-                       language_opts_set(ud->builder, "SourceAudioLang");
+               else if (strcmp(name, "PreferredLanguage") == 0)
+                       language_opts_set(ud->builder, "PreferredLanguage");
                else if (strcmp(name, "title") == 0)
                        title_opts_set(ud->builder, "title");
                else if (strcmp(name, "SubtitleTrack") == 0)
@@ -2246,7 +2287,7 @@ init_ui_combo_boxes(GtkBuilder *builder)
        init_combo_box(builder, "AudioSamplerate");
        init_combo_box(builder, "VideoFramerate");
        init_combo_box(builder, "AudioMixdown");
-       init_combo_box(builder, "SourceAudioLang");
+       init_combo_box(builder, "PreferredLanguage");
        init_combo_box(builder, "title");
        init_combo_box(builder, "AudioTrack");
        for (ii = 0; combo_name_map[ii].name != NULL; ii++)
@@ -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)