Merge branch 1.0-bugfix (early part) into master

[vlc] / modules / misc / dummy / input.c

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index 81e24b072292196442862b3d89e9bb6fdfd1f78e..af93d5320e65dc92244adc136bd3978f6549ee7f 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * input_dummy.c: dummy input plugin, to manage "vlc:***" special options
+ * input_dummy.c: dummy input plugin, to manage "vlc://" special options
  *****************************************************************************
  * Copyright (C) 2001, 2002 the VideoLAN team
  * $Id$
@@ -33,14 +33,13 @@
 #include <vlc_interface.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
-#include <vlc_playlist.h>
 
 #include "dummy.h"
 
 /*****************************************************************************
  * Access functions.
  *****************************************************************************/
-static int AccessRead( access_t *p_access, uint8_t *p, int i_size )
+static ssize_t AccessRead( access_t *p_access, uint8_t *p, size_t i_size )
 {
     VLC_UNUSED(p_access);
     memset( p, 0, i_size );
@@ -48,9 +47,8 @@ static int AccessRead( access_t *p_access, uint8_t *p, int i_size )
 }
 static int AccessControl( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool        *pb_bool;
+    int64_t     *pi_64;
 
     switch( i_query )
     {
@@ -64,11 +62,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY * 1000;
@@ -124,9 +117,6 @@ struct demux_sys_t
 
     /* Used for the pause command */
     mtime_t expiration;
- 
-    /* The command to run */
-    char* psz_command;
 };
 enum
 {
@@ -155,7 +145,7 @@ int OpenDemux ( vlc_object_t *p_this )
     p_demux->pf_control = DemuxControl;
     p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
 
-    /* Check for a "vlc:nop" command */
+    /* Check for a "vlc://nop" command */
     if( i_len == 3 && !strncasecmp( psz_name, "nop", 3 ) )
     {
         msg_Info( p_demux, "command `nop'" );
@@ -163,7 +153,7 @@ int OpenDemux ( vlc_object_t *p_this )
         return VLC_SUCCESS;
     }
 
-    /* Check for a "vlc:quit" command */
+    /* Check for a "vlc://quit" command */
     if( i_len == 4 && !strncasecmp( psz_name, "quit", 4 ) )
     {
         msg_Info( p_demux, "command `quit'" );
@@ -171,7 +161,7 @@ int OpenDemux ( vlc_object_t *p_this )
         return VLC_SUCCESS;
     }
 
-    /* Check for a "vlc:pause:***" command */
+    /* Check for a "vlc://pause:***" command */
     if( i_len > 6 && !strncasecmp( psz_name, "pause:", 6 ) )
     {
         i_arg = atoi( psz_name + 6 );
@@ -203,22 +193,13 @@ void CloseDemux ( vlc_object_t *p_this )
 static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    playlist_t *p_playlist;
     bool b_eof = false;
 
-    p_playlist = vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, FIND_PARENT );
-
-    if( p_playlist == NULL )
-    {
-        msg_Err( p_demux, "we are not attached to a playlist" );
-        return -1;
-    }
-
     switch( p_sys->i_command )
     {
         case COMMAND_QUIT:
             b_eof = true;
-            vlc_object_kill( p_demux->p_libvlc );
+            libvlc_Quit( p_demux->p_libvlc );
             break;
 
         case COMMAND_PAUSE:
@@ -234,7 +215,6 @@ static int Demux( demux_t *p_demux )
             break;
     }
 
-    vlc_object_release( p_playlist );
     return b_eof ? 0 : 1;
 }