[xine-cvs] CVS: gnome-xine/src gtkvideo.c,1.40,1.41 post.c,1.19,1.20

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14935/src

Modified Files:
	gtkvideo.c post.c 
Log Message:
Fix deinterlacer configuration & usage.


Index: gtkvideo.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gtkvideo.c	20 Jan 2005 18:31:22 -0000	1.40
+++ gtkvideo.c	8 Mar 2005 18:20:24 -0000	1.41
@@ -1368,7 +1368,7 @@
   GList *list = priv->post_video_enable ? g_list_copy (priv->post_video) : NULL;
   GList *item, *next = NULL;
 
-  if (priv->tvtime_plugin)
+  if (priv->tvtime_plugin && priv->deinterlace)
     list = g_list_prepend (list, priv->tvtime_plugin);
 
   xine_post_wire_video_port (xine_get_video_source (priv->stream),
@@ -1633,7 +1633,7 @@
   g_return_if_fail (priv->stream != NULL);
 
   priv->deinterlace = set;
-  if (!priv->tvtime_plugin)
+  if (priv->tvtime_plugin)
   {
     gtv_unwire_plugins_video (priv);
     gtv_wire_plugins_video (priv);

Index: post.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/post.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- post.c	2 Feb 2005 02:39:59 -0000	1.19
+++ post.c	8 Mar 2005 18:20:24 -0000	1.20
@@ -1002,8 +1002,11 @@
 deinterlace_reconfigure (gxine_post_t *info)
 {
   xine_cfg_entry_t entry;
-  char *cfg;
-  asprintf (&cfg, "tvtime:%s", info->parameters);
+  char *cfg, *params = post_make_parameter_string (info);
+  logprintf ("post_config: deinterlace configuration\n  was: %s\n  now: %s\n",
+	     info->parameters, params);
+  free (info->parameters);
+  asprintf (&cfg, "tvtime:%s", info->parameters = params);
   gtk_video_set_tvtime (GTK_VIDEO(gtv), cfg);
   if (xine_config_lookup_entry (xine, "gui.post_plugins.deinterlace", &entry))
   {