LinGui: Audio and subtitle UI rework.

Adds new tabs for audio and subtitle defaults (presets).
"Audio" and "Subtitle" tabs renamed to "Audio List" and "Subtitle List"

New Preset Keys:
    AudioLanguageList - array of strings
        List of languages that will be used to generate the output
        audio tracks for a job.
        Values: preset      -   UI display
            iso639_2 codes  - native_name if not NULL, else eng_name

    SubtitleLanguageList - array of strings
        List of languages that will be used to generate the output
        subtitle tracks for a job.
        Values: preset      -   UI display
            iso639_2 codes  - native_name if not NULL, else eng_name

    AudioTrackSelectionBehavior - string
        Defines how source tracks will be selected when generating
        the audio list for a job.
        Values: preset      -   UI display
            none            -   None
            first           -   First Matching Selected Languages
            all             -   All Matching Selected Languages

    SubtitleTrackSelectionBehavior - string
        Defines how source tracks will be selected when generating
        the subtitle list for a job.
        Values: preset      -   UI display
            none            -   None
            first           -   First Matching Selected Languages
            all             -   All Matching Selected Languages

    SubtitleAddCC - boolean
        Add Closed Caption track to subtitle list if available

    SubtitleAddForeignAudioSearch - boolean
        Add Foreign audio search pass to job if a default subtitle
        language is set (i.e. SubtitleLanguageList is not empty and
        first entry is not "Any") and default audio track language
        matches subtitle preferred language.

    SubtitleAddForeignAudioSubtitle - boolean
        Add preferred language subtitle track if the default subtitle
        language is set (i.e. SubtitleLanguageList is not empty and
        first entry is not "Any") and default audio track language
        does not match the preferred subtitle language.

Removed Preset Keys:
    AudioTrack

    SubtitleList - I think only the LinGui had this key.

Note that the remaining keys in the pre-existing AudioList are reused
and map to the "Audio Encoder Settings" on the "Audio Defaults" tab.
They used to map to the entries in the list on the old "Audio" tab.
The old "Audio" tab is now the "Audio List" tab.  Nothing in the "Audio
List"
tab map to preset values in the new design.  The contents of this tab is
strictly for use in the encode job.  Ditto for "Subtitle Defaults" and
"Subtitle List".

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6040 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 17 insertions, 8 deletions

diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 7b514cf8d..9aaf94fcc 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -19,6 +19,7 @@
 
 #include "settings.h"
 #include "hb.h"
+#include "lang.h"
 
 enum
 {
@@ -120,18 +121,13 @@ void ghb_set_bitrate_opts(
 void ghb_grey_combo_options(signal_user_data_t *ud);
 void ghb_update_ui_combo_box(
     signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
-const gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
-gint ghb_find_audio_track(
-    gint titleindex, const gchar *lang, gint acodec, 
-    gint fallback_acodec, GHashTable *track_indices);
+const gchar* ghb_get_source_audio_lang(hb_title_t *title, gint track);
+gint ghb_find_audio_track(hb_title_t *title, const gchar *lang, int start);
 const gchar* ghb_audio_track_description(gint track, int titleindex);
 void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
 gint ghb_find_pref_subtitle_track(const gchar *lang);
-gint ghb_find_subtitle_track(
-    gint titleindex, const gchar *lang, gboolean burn, 
-    gboolean force, gint source, GHashTable *track_indices);
+gint ghb_find_subtitle_track(hb_title_t * title, const gchar * lang, int start);
 gint ghb_pick_subtitle_track(signal_user_data_t *ud);
-gint ghb_find_cc_track(gint titleindex);
 gint ghb_longest_title(void);
 gchar* ghb_build_advanced_opts_string(GValue *settings);
 GdkPixbuf* ghb_get_preview_image(
@@ -158,4 +154,17 @@ gchar* ghb_get_tmp_dir();
 gint ghb_find_closest_audio_samplerate(gint rate);
 GValue* ghb_lookup_audio_encoder_value(gint val);
 
+void ghb_init_lang_list_box(GtkListBox *list_box);
+
+void ghb_init_combo_box(GtkComboBox *combo);
+void ghb_audio_encoder_opts_set(GtkComboBox *combo);
+void ghb_audio_bitrate_opts_set(GtkComboBox *combo, gboolean extra);
+void ghb_audio_bitrate_opts_filter(GtkComboBox *combo, gint first_rate, gint last_rate);
+void ghb_mix_opts_set(GtkComboBox *combo);
+void ghb_mix_opts_filter(GtkComboBox *combo, gint acodec);
+void ghb_audio_samplerate_opts_set(GtkComboBox *combo);
+
+int ghb_lookup_audio_lang(const GValue *glang);
+const iso639_lang_t* ghb_iso639_lookup_by_int(int idx);
+
 #endif // _HBBACKEND_H_