From 745e1f2a8ffa472119521b459c5083177cb3274c Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Fri, 27 Jul 2001 15:50:04 +0000
Subject: More check about devfs support. Dont call open() in non blocking mode
 if it's not necessary.

CVS patchset: 358
CVS date: 2001/07/27 15:50:04
---
 src/input/input_dvd.c        | 22 +++++++++++++---------
 src/input/input_stdin_fifo.c |  4 ++--
 src/input/input_vcd.c        |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index fb8f198ba..082c9867f 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.15 2001/07/17 13:28:10 jkeil Exp $
+ * $Id: input_dvd.c,v 1.16 2001/07/27 15:50:04 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -56,7 +56,7 @@ static uint32_t xine_debug;
 #define RDVD    "/vol/dev/aliases/cdrom0"
 #define DVD     RDVD
 #else
-#ifdef CONFIG_DEVFS_FS
+#if defined(CONFIG_DEVFS_FS) && defined(CONFIG_DEVFS_MOUNT)
 #define DVD     "/dev/cdroms/dvd"
 #define RDVD    "/dev/cdroms/rdvd"
 #else
@@ -101,7 +101,7 @@ typedef struct {
 /* ***************************************************************** */
 static int openDrive (dvd_input_plugin_t *this) {
   
-  this->dvd_fd = open(DVD, O_RDONLY | O_NONBLOCK);
+  this->dvd_fd = open(DVD, O_RDONLY /* | O_NONBLOCK */ );
 
   if (this->dvd_fd < 0) {
     printf ("input_dvd: unable to open dvd drive (%s): %s\n", DVD,
@@ -109,7 +109,7 @@ static int openDrive (dvd_input_plugin_t *this) {
     return -1;
   }
 
-  this->raw_fd = open(RDVD, O_RDONLY | O_NONBLOCK);
+  this->raw_fd = open(RDVD, O_RDONLY /* | O_NONBLOCK */ );
   if (this->raw_fd < 0) {
     this->raw_fd = this->dvd_fd;
   }
@@ -436,7 +436,7 @@ static mrl_t **dvd_plugin_get_dir (input_plugin_t *this_gen,
   if (filename)
     return NULL;
   
-  if((fd = open(DVD, O_RDONLY|O_NONBLOCK)) > -1) {
+  if((fd = open(DVD, O_RDONLY /* | O_NONBLOCK */ )) > -1) {
     int nFiles, nFiles2;
 	
     UDFListDir (fd, "/VIDEO_TS", MAX_DIR_ENTRIES, this->filelist, &nFiles);
@@ -490,9 +490,11 @@ static mrl_t **dvd_plugin_get_dir (input_plugin_t *this_gen,
     close (fd);
 
   }
-  else
+  else {
+    printf ("input_dvd: unable to open dvd drive (%s): %s\n", DVD,
+	    strerror(errno));
     return NULL;
-
+  }
   /*
    * Freeing exceeded mrls if exists.
    */
@@ -521,9 +523,9 @@ static char **dvd_plugin_get_autoplay_list (input_plugin_t *this_gen,
   dvd_input_plugin_t *this = (dvd_input_plugin_t *) this_gen;
   int i, fd;
   
-  if((fd = open(DVD, O_RDONLY|O_NONBLOCK)) > -1) {
+  if((fd = open(DVD, O_RDONLY /* | O_NONBLOCK */ )) > -1) {
     int    nFiles3, nFiles2;
-    
+
     UDFListDir (fd, "/VIDEO_TS", MAX_DIR_ENTRIES, this->filelist, &nFiles3);
     
     nFiles2 = 0;
@@ -550,6 +552,8 @@ static char **dvd_plugin_get_autoplay_list (input_plugin_t *this_gen,
     close (fd);
 
   } else {
+    printf ("input_dvd: unable to open dvd drive (%s): %s\n", DVD,
+	    strerror(errno));
     *nFiles = 0;
     return NULL;
   }
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index e5fda5300..3624c42a9 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_stdin_fifo.c,v 1.8 2001/07/10 21:07:55 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.9 2001/07/27 15:50:04 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ static int stdin_plugin_open(input_plugin_t *this_gen, char *mrl) {
 
   if(!strncasecmp(mrl, "stdin:", 6) 
       || !strncmp(mrl, "-", 1)) {
-#ifdef CONFIG_DEVFS_FS
+#if defined(CONFIG_DEVFS_FS) && defined (CONFIG_DEVFS_MOUNT)
     filename = "/dev/vc/stdin";
 #else
     filename = "/dev/stdin";
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 7e46f4cbe..59006d67d 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_vcd.c,v 1.16 2001/07/25 08:42:05 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.17 2001/07/27 15:50:04 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -57,7 +57,7 @@ static uint32_t xine_debug;
 #define	CDROM	       "/vol/dev/aliases/cdrom0"
 #else
 /* for FreeBSD make a link to the right devnode, like /dev/acd0c */
-#ifdef CONFIG_DEVFS_FS
+#if defined(CONFIG_DEVFS_FS) && defined (CONFIG_DEVFS_MOUNT)
 #define CDROM          "/dev/cdroms/cdrom"
 #else
 #define CDROM          "/dev/cdrom"
-- 
cgit v1.2.3