[MPlayer-cvslog] r27897 - in trunk/stream: dvb_tune.c stream_dvb.c

[nicodvb]

Author: nicodvb
Date: Thu Nov  6 00:37:52 2008
New Revision: 27897

Log:
set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar

Modified:
   trunk/stream/dvb_tune.c
   trunk/stream/stream_dvb.c

Modified: trunk/stream/dvb_tune.c
==============================================================================
--- trunk/stream/dvb_tune.c	(original)
+++ trunk/stream/dvb_tune.c	Thu Nov  6 00:37:52 2008
@@ -117,9 +117,7 @@ int dvb_open_devices(dvb_priv_t *priv, i
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
 		return 0;
 	}
-#ifdef CONFIG_DVB_HEAD
-	priv->sec_fd=-1;
-#else
+#ifndef CONFIG_DVB_HEAD
 	priv->sec_fd = open(sec_dev, O_RDWR);
 	if(priv->sec_fd < 0)
 	{

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Thu Nov  6 00:37:52 2008
@@ -614,6 +614,7 @@ static void dvbin_close(stream_t *stream
 #ifndef CONFIG_DVB_HEAD
 	close(priv->sec_fd);
 #endif
+	priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
 
 	priv->is_on = 0;
 	dvb_free_config(priv->config);
@@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, in
 		return STREAM_ERROR;
 
 	priv = (dvb_priv_t *)stream->priv;
+	priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
 	priv->config = dvb_get_config();
 	if(priv->config == NULL)
 	{