Removes trailing spaces. Removes tabs.

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

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index e6f62e273f9fa8df937f1ceda28d20b2b094f9d6..d4a0d76247c72ed5a9eba3a439f1353ccde8725d 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -24,12 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/input.h>
+#include <vlc_interface.h>
+#include <vlc_access.h>
+#include <vlc_demux.h>
+#include <vlc_playlist.h>
+
+#include "dummy.h"
 
 /*****************************************************************************
  * Access functions.
@@ -116,7 +118,7 @@ struct demux_sys_t
 
     /* Used for the pause command */
     mtime_t expiration;
-    
+ 
     /* The command to run */
     char* psz_command;
 };
@@ -172,7 +174,7 @@ int E_(OpenDemux) ( vlc_object_t *p_this )
         p_sys->expiration = mdate() + (mtime_t)i_arg * (mtime_t)1000000;
         return VLC_SUCCESS;
     }
-    
+ 
     msg_Err( p_demux, "unknown command `%s'", psz_name );
 
     free( p_sys );
@@ -209,7 +211,8 @@ static int Demux( demux_t *p_demux )
     switch( p_sys->i_command )
     {
         case COMMAND_QUIT:
-            b_eof = p_demux->p_vlc->b_die = VLC_TRUE;
+            b_eof = VLC_TRUE;
+            vlc_object_kill( p_demux->p_libvlc );
             break;
 
         case COMMAND_PAUSE:
@@ -218,11 +221,11 @@ static int Demux( demux_t *p_demux )
             else
                 msleep( 10000 );
             break;
-        
+ 
         case COMMAND_NOP:
         default:
             b_eof = VLC_TRUE;
-            break;       
+            break;
     }
 
     vlc_object_release( p_playlist );