summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-06-03 15:37:38 +0000
committerRodeo <[email protected]>2013-06-03 15:37:38 +0000
commit16deb214281cd72ffaf2a11d3a5556c5b950a966 (patch)
treef673787fe7a92a894ec2ccace325af298831ef92 /gtk
parent812134ffba931aa603e67f541e7a2f0f03215fbb (diff)
libhb/common: improve fallback mechanism.
API changes: - added hb_global_init(), must be called before any other libhb function - removed (somewhat pointless) hb_mixdown_t.internal_name - some hb_*_get_from_name() functions now return 0 instead of -1. Instead of hardcoded fallbacks, list items now have a specific fallback, and a generic ID for when the specific fallback is unavailable. Encoder availability is checked at runtime (hb_global_init calling hb_common_global_init) and the item's value/fallback is sanity-checked and updated if necessary. See https://reviews.handbrake.fr/r/506/ for more detailed information. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5547 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/hb-backend.c2
-rw-r--r--gtk/src/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index b3f82067c..ace8291b4 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1891,7 +1891,7 @@ mix_opts_set(GtkBuilder *builder, const gchar *name)
1, TRUE,
2, mix->short_name,
3, (gdouble)mix->amixdown,
- 4, mix->internal_name,
+ 4, mix->short_name,
-1);
g_free(str);
}
diff --git a/gtk/src/main.c b/gtk/src/main.c
index b990ec0c4..b656f7812 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -849,6 +849,8 @@ main(int argc, char *argv[])
GError *error = NULL;
GOptionContext *context;
+ hb_global_init();
+
#ifdef ENABLE_NLS
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");