* ./extras/MacOSX_dvdioctl: removed outdated files.

[vlc] / plugins / vcd / input_vcd.c

diff --git a/plugins/vcd/input_vcd.c b/plugins/vcd/input_vcd.c
index acc3c919cd6a0da9fc571bff17f19244a3fab2b5..fa850ba7c5e2aa6af189645016d34ff2c870ea00 100644 (file)
--- a/plugins/vcd/input_vcd.c
+++ b/plugins/vcd/input_vcd.c
@@ -34,13 +34,10 @@
 
 #include <fcntl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
 
-#ifdef STRNCASECMP_IN_STRINGS_H
-#   include <strings.h>
-#endif
-
 #if defined( WIN32 )
 #   include <io.h>                                                 /* read() */
 #else
@@ -167,7 +164,7 @@ static int VCDOpen( struct input_thread_s *p_input )
             free( psz_orig );
             return -1;
         }
-        psz_source = config_GetPszVariable( INPUT_VCD_DEVICE_VAR );
+        psz_source = config_GetPszVariable( "vcd_device" );
     }
 
     /* test the type of file given */
@@ -294,7 +291,6 @@ static void VCDClose( struct input_thread_s *p_input )
 {
     thread_vcd_data_t *p_vcd = (thread_vcd_data_t *)p_input->p_access_data;
 
-    input_BuffersEnd( p_input->p_method_data );
     close( p_vcd->i_handle );
     free( p_vcd );
 }
@@ -458,6 +454,11 @@ static int VCDInit( input_thread_t * p_input )
 {
     es_descriptor_t *       p_es;
     
+    if( p_input->stream.i_method != INPUT_METHOD_VCD )
+    {
+        return -1;
+    }
+
     vlc_mutex_lock( &p_input->stream.stream_lock );
     
     /* Set program information. */