From 8b085eff7b53cf7d23aa35e3f911dac0eeeb4967 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Mon, 24 Nov 2008 00:18:17 +0000 Subject: LinGui: live preview. this adds new prerequisites to the build. now needs: gthread-2.0, gstreamer-0.10, gstreamer-interfaces-0.10, gstreamer-video-0.10, gstreamer-pbutils-0.10 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1949 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gtk/src/main.c') diff --git a/gtk/src/main.c b/gtk/src/main.c index 08d7ff1a3..061364b02 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include "hbversion.h" @@ -47,6 +48,7 @@ #include "settings.h" #include "resources.h" #include "presets.h" +#include "preview.h" /* @@ -491,6 +493,7 @@ main (int argc, char *argv[]) GValue *preset; GError *error = NULL; GOptionContext *context; + GtkWidget *widget; mm_flags = mm_support(); #ifdef ENABLE_NLS @@ -499,9 +502,12 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif + if (!g_thread_supported()) + g_thread_init(NULL); context = g_option_context_new ("- Rip and encode DVD or MPEG file"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_add_group (context, gst_init_get_option_group ()); g_option_context_parse (context, &argc, &argv, &error); g_option_context_free(context); @@ -523,6 +529,7 @@ main (int argc, char *argv[]) watch_volumes (ud); ud->builder = create_builder_or_die (BUILDER_NAME); // Redirect stderr to the activity window + ghb_preview_init(ud); IoRedirect(ud); ghb_log("Handbrake Version: %s (%d)", HB_VERSION, HB_BUILD); ghb_init_dep_map(); @@ -567,7 +574,6 @@ main (int argc, char *argv[]) ghb_hbfd(ud, TRUE); } gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks"); - GtkWidget *widget; widget = GHB_WIDGET(ud->builder, "PictureDeinterlace"); tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget); widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace"); -- cgit v1.2.3