From c83b6e95ade4d9b1c908093fdb56315fc8f8aacc Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sun, 23 Feb 2014 20:03:32 +0000 Subject: LinGui: rework how hb audio encoders are referenced from lingui Cleans up the interface and fixes failure to use fallbacks properly git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6068 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/queuehandler.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gtk/src/queuehandler.c') diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index 2979d09aa..3dd07af69 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -530,20 +530,19 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) for (ii = 0; ii < count; ii++) { gchar *quality = NULL, *samplerate, *track; - const gchar *acodec_opt, *mix; - int acodec; + const gchar *mix; GValue *asettings; gdouble sr; + const hb_encoder_t *encoder; asettings = ghb_array_get_nth(audio_list, ii); - acodec = ghb_settings_combo_int(asettings, "AudioEncoder"); - acodec_opt = ghb_settings_combo_option(asettings, "AudioEncoder"); + encoder = ghb_settings_audio_encoder(asettings, "AudioEncoder"); double q = ghb_settings_get_double(asettings, "AudioTrackQuality"); if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") && q != HB_INVALID_AUDIO_QUALITY) { - quality = ghb_format_quality("Quality: ", acodec, q); + quality = ghb_format_quality("Quality: ", encoder->codec, q); } else { @@ -566,15 +565,15 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter) if (count > 1) XPRINT("\t"); - if (acodec & HB_ACODEC_PASS_FLAG) + if (encoder->codec & HB_ACODEC_PASS_FLAG) { - XPRINT("%s, Encoder: %s\n", track, acodec_opt); + XPRINT("%s, Encoder: %s\n", track, encoder->name); } else { XPRINT( "%s, Encoder: %s, Mixdown: %s, SampleRate: %s, %s\n", - track, acodec_opt, mix, samplerate, quality); + track, encoder->name, mix, samplerate, quality); } g_free(track); g_free(quality); -- cgit v1.2.3