[xine-cvs] CVS: xine-lib/src/input input_dvd.c,1.115,1.116

[Michael R. <mr...@pr...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1:/tmp/cvs-serv18754

Modified Files:
	input_dvd.c 
Log Message:
getting rid of obviously unused INPUT_CAP_VARIABLE_BITRATE
fix ejecting (works now)


Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- input_dvd.c	17 Nov 2002 16:23:38 -0000	1.115
+++ input_dvd.c	18 Nov 2002 11:33:59 -0000	1.116
@@ -211,7 +211,7 @@
 
   return INPUT_CAP_BLOCK |
 #if CAN_SEEK
-    (this->seekable ? INPUT_CAP_SEEKABLE : 0) | INPUT_CAP_VARIABLE_BITRATE | 
+    (this->seekable ? INPUT_CAP_SEEKABLE : 0) |
 #endif
     INPUT_CAP_AUDIOLANG | INPUT_CAP_SPULANG | INPUT_CAP_CHAPTERS; 
 }
@@ -1555,19 +1555,17 @@
 }
 
 static int dvd_class_eject_media (input_class_t *this_gen) {
-  dvd_input_plugin_t *this = (dvd_input_plugin_t *) this_gen;
+  dvd_input_class_t *this = (dvd_input_class_t *) this_gen;
   int   ret, status;
   int   fd;
 
   /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",this->dvd_device, this->current_dvd_device, this->opened, this->dvdnav); */
-/* FIXME: dvd_plugin_dispose must happen before eject, but we don't have the plugin stream pointer. */
-/*  dvd_plugin_dispose (this_gen) ;*/
-  ret=dvd_umount_media(this->current_dvd_device);
+  ret=dvd_umount_media(this->dvd_device);
   /**********
         printf("ipnut_dvd: umount result: %s\n", 
                   strerror(errno));  
    ***********/
-  if ((fd = open (this->current_dvd_device, O_RDONLY|O_NONBLOCK)) > -1) {
+  if ((fd = open (this->dvd_device, O_RDONLY|O_NONBLOCK)) > -1) {
 
 #if defined (__linux__)
     if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
@@ -1611,7 +1609,7 @@
 
     close(fd);
   } else {
-    printf("input_dvd: Device %s failed to open during eject calls\n",this->current_dvd_device);
+    printf("input_dvd: Device %s failed to open during eject calls\n",this->dvd_device);
   }
   return 1;
 }
@@ -1666,6 +1664,10 @@
 
 /*
  * $Log$
+ * Revision 1.116  2002/11/18 11:33:59  mroi
+ * getting rid of obviously unused INPUT_CAP_VARIABLE_BITRATE
+ * fix ejecting (works now)
+ *
  * Revision 1.115  2002/11/17 16:23:38  mroi
  * cleanup: bring config entries back to life
  * introduce a seekable flag