[xine-cvs] CVS: xine-lib/src/input input_dvb.c,1.62,1.63

[Mike L. <mla...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26147

Modified Files:
	input_dvb.c 
Log Message:
multiple epg fixes: fix for incorrectly parsed running status, clear old epg
data, fix cropped epg texts, fix epg holding up demuxer thread.


Index: input_dvb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvb.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- input_dvb.c	15 Dec 2004 20:57:28 -0000	1.62
+++ input_dvb.c	19 Dec 2004 19:10:39 -0000	1.63
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2000-2004 the xine project
  * 
  * This file is part of xine, a free video player.
@@ -47,11 +47,12 @@
  *   and leave primary card for viewing.
  * - allow for handing off of EPG data to specialised frontends, instead of displaying via
  *   OSD - this will allow for filtering/searching of epg data - useful for automatic recording :)
- * - Parse EPG info directly from TS to allow for constant updates, or read from a separate thread.  
- *   Activating EPG will currently block the calling thread, which may cause issues with recording.
[...992 lines suppressed...]
@@ -2907,16 +3078,15 @@
 			1,
 			_("Remember last DVB channel watched"),
 			_("On autoplay, xine will remember and "
-			  "switch to this channel. "),
+			  "switch to the channel indicated in media.dvb.last_channel. "),
 			0, NULL, NULL);
 
   /* Enable remembering of last watched channel never show this entry*/
   config->register_num(config, "media.dvb.last_channel",
 		       -1,
 		       _("Last DVB channel viewed"),
-		       _("If enabled above, xine will remember and "
-			 "switch to this channel. "),
-		       15, NULL, NULL);
+		       _("If enabled xine will remember and switch to this channel. "),
+		       21, NULL, NULL);
 
 
   config->register_num(config, "media.dvb.adapter",