if (ghb_audio_is_passthru (acodec))
{
- ghb_set_default_bitrate_opts (ud->builder, -1);
+ ghb_set_default_bitrate_opts (ud->builder, 0, -1);
if (ghb_get_audio_info (&ainfo, titleindex, audioindex))
{
gint br = ainfo.bitrate / 1000;
// Set the values for bitrate and samplerate to the input rates
- ghb_set_passthru_bitrate_opts (ud->builder, br);
+ if (br >= 8)
+ ghb_set_passthru_bitrate_opts (ud->builder, br);
+ else
+ br = 160;
ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br));
ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(0));
}
ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0));
}
- else if (acodec == HB_ACODEC_FAAC && mix != HB_AMIXDOWN_6CH)
+ else if (acodec == HB_ACODEC_FAAC)
{
- gint br;
+ gint br, last = 160, first = 0;
+
+ if (mix == HB_AMIXDOWN_6CH)
+ {
+ first = 192;
+ last = 448;
+ }
widget = GHB_WIDGET(ud->builder, "AudioBitrate");
gval = ghb_widget_value(widget);
br = ghb_lookup_combo_int("AudioBitrate", gval);
ghb_value_free(gval);
- if (br > 160)
- ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(160));
- ghb_set_default_bitrate_opts (ud->builder, 160);
+ if (br > last)
+ ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(last));
+ if (br < first)
+ ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(first));
+ ghb_set_default_bitrate_opts (ud->builder, first, last);
}
else
{
- ghb_set_default_bitrate_opts (ud->builder, -1);
+ ghb_set_default_bitrate_opts (ud->builder, 0, -1);
}
}
g_free(data);
}
+gchar*
+ghb_get_user_audio_lang(signal_user_data_t *ud, gint titleindex, gint track)
+{
+ GValue *audio_list, *asettings;
+ gchar *lang = NULL;
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ if (ghb_array_len(audio_list) <= track)
+ return NULL;
+ asettings = ghb_array_get_nth(audio_list, track);
+ track = ghb_settings_get_int(asettings, "AudioTrack");
+ lang = ghb_get_source_audio_lang(titleindex, track);
+ return lang;
+}
+
void
ghb_set_pref_audio(gint titleindex, signal_user_data_t *ud)
{
gint acodec_code, mix_code, track;
- gchar *source_lang;
+ gchar *source_lang = NULL;
GtkWidget *button;
ghb_audio_info_t ainfo;
GHashTable *track_indices;
ghb_clear_audio_list(ud);
// Find "best" audio based on audio preferences
button = GHB_WIDGET (ud->builder, "audio_add");
- source_lang = ghb_settings_get_string(ud->settings, "SourceAudioLang");
+ if (!ghb_settings_get_boolean(ud->settings, "AudioDUB"))
+ {
+ source_lang = ghb_get_source_audio_lang(titleindex, 0);
+ }
+ if (source_lang == NULL)
+ source_lang = ghb_settings_get_string(ud->settings, "PreferredLanguage");
pref_audio = ghb_settings_get_value(ud->settings, "AudioList");
titleindex, track, acodec_code, mix_code);
ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code));
}
+ ghb_adjust_audio_rate_combos(ud);
ghb_ui_update(ud, "AudioTrackDRCSlider", drc);
}
}
return asettings;
}
-static void
-audio_list_refresh_selected(signal_user_data_t *ud)
+void
+ghb_audio_list_refresh_selected(signal_user_data_t *ud)
{
GtkTreeView *treeview;
GtkTreePath *treepath;
GValue *asettings = NULL;
const GValue *audio_list;
- g_debug("audio_list_refresh_selected ()");
+ g_debug("ghb_audio_list_refresh_selected ()");
treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
selection = gtk_tree_view_get_selection (treeview);
if (gtk_tree_selection_get_selected(selection, &store, &iter))
{
const gchar *track, *codec, *br, *sr, *mix;
gchar *s_drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
+ gint itrack, icodec;
gdouble drc;
// Get the row number
treepath = gtk_tree_model_get_path (store, &iter);
asettings = ghb_array_get_nth(audio_list, row);
track = ghb_settings_combo_option(asettings, "AudioTrack");
+ itrack = ghb_settings_combo_int(asettings, "AudioTrack");
codec = ghb_settings_combo_option(asettings, "AudioEncoder");
+ icodec = ghb_settings_combo_int(asettings, "AudioEncoder");
br = ghb_settings_combo_option(asettings, "AudioBitrate");
sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
mix = ghb_settings_combo_option(asettings, "AudioMixdown");
else
s_drc = g_strdup_printf("%.1f", drc);
+ if (icodec == HB_ACODEC_MASK)
+ codec = ghb_select_audio_codec_str(ud, itrack);
+
gtk_list_store_set(GTK_LIST_STORE(store), &iter,
// These are displayed in list
0, track,
}
ghb_adjust_audio_rate_combos(ud);
ghb_grey_combo_options (ud->builder);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
prev_acodec = acodec_code;
asettings = get_selected_asettings(ud);
if (asettings != NULL)
{
ghb_widget_to_setting(asettings, widget);
- audio_list_refresh_selected(ud);
- }
-
- const GValue *audio_list;
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- if (ghb_ac3_in_audio_list (audio_list))
- {
- gchar *container;
-
- container = ghb_settings_get_string(ud->settings, "FileFormat");
- if (strcmp(container, "mp4") == 0)
- {
- ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
- }
- g_free(container);
+ ghb_audio_list_refresh_selected(ud);
}
+ ghb_update_destination_extension(ud);
ghb_live_reset(ud);
}
g_debug("audio_track_changed_cb ()");
ghb_adjust_audio_rate_combos(ud);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
ghb_grey_combo_options(ud->builder);
asettings = get_selected_asettings(ud);
if (asettings != NULL)
const gchar *track;
ghb_widget_to_setting(asettings, widget);
- audio_list_refresh_selected(ud);
+ ghb_audio_list_refresh_selected(ud);
track = ghb_settings_combo_option(asettings, "AudioTrack");
ghb_settings_set_string(asettings, "AudioTrackDescription", track);
}
g_debug("audio_mix_changed_cb ()");
ghb_adjust_audio_rate_combos(ud);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
asettings = get_selected_asettings(ud);
if (asettings != NULL)
{
ghb_widget_to_setting(asettings, widget);
- audio_list_refresh_selected(ud);
+ ghb_audio_list_refresh_selected(ud);
}
ghb_live_reset(ud);
}
GValue *asettings;
g_debug("audio_widget_changed_cb ()");
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
asettings = get_selected_asettings(ud);
if (asettings != NULL)
{
ghb_widget_to_setting(asettings, widget);
- audio_list_refresh_selected(ud);
+ ghb_audio_list_refresh_selected(ud);
}
ghb_live_reset(ud);
}
drc = g_strdup_printf("%.1f", val);
gtk_label_set_text(label, drc);
g_free(drc);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
asettings = get_selected_asettings(ud);
if (asettings != NULL)
{
ghb_widget_to_setting(asettings, widget);
- audio_list_refresh_selected(ud);
+ ghb_audio_list_refresh_selected(ud);
}
ghb_live_reset(ud);
}
const gchar *name = gtk_widget_get_name(widget);
g_debug("subtitle_changed_cb () %s", name);
ghb_widget_to_setting(ud->settings, widget);
- ghb_check_dependency(ud, widget);
+ ghb_check_dependency(ud, widget, NULL);
ghb_live_reset(ud);
}
GtkTreeSelection *selection;
const gchar *track, *codec, *br, *sr, *mix;
gchar *s_drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
+ gint icodec, itrack;
gdouble drc;
g_debug("add_to_audio_list ()");
store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
track = ghb_settings_combo_option(settings, "AudioTrack");
+ itrack = ghb_settings_combo_int(settings, "AudioTrack");
codec = ghb_settings_combo_option(settings, "AudioEncoder");
+ icodec = ghb_settings_combo_int(settings, "AudioEncoder");
br = ghb_settings_combo_option(settings, "AudioBitrate");
sr = ghb_settings_combo_option(settings, "AudioSamplerate");
mix = ghb_settings_combo_option(settings, "AudioMixdown");
else
s_drc = g_strdup_printf("%.1f", drc);
+ if (icodec == HB_ACODEC_MASK)
+ {
+ codec = ghb_select_audio_codec_str(ud, itrack);
+ }
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
{
gtk_widget_set_sensitive(xwidget, FALSE);
}
+ ghb_update_destination_extension(ud);
}
G_MODULE_EXPORT void