* modules/demux/sgimb.c

[vlc] / modules / demux / demuxdump.c

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index e9ba85c2ca6045cf073a8b8e92786b9f51b0aea2..cec0220160c94bd5c65fde60106fee8cc7bafcee 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * demuxdump.c : Pseudo demux module for vlc (dump raw stream)
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: demuxdump.c,v 1.9 2003/05/15 22:27:37 massiot Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: demuxdump.c,v 1.12 2004/01/25 20:05:28 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -38,24 +38,23 @@
  *****************************************************************************/
 static int  Activate ( vlc_object_t * );
 static int  Demux ( input_thread_t * );
-static void Desactivate ( vlc_object_t * );
+static void Deactivate ( vlc_object_t * );
 
 #define DUMP_BLOCKSIZE  16384
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define FILE_TEXT N_("Dump file name")
+#define FILE_TEXT N_("Filename of dump")
 #define FILE_LONGTEXT N_( \
     "Specify a file name to which the raw stream will be dumped." )
 
 vlc_module_begin();
-    set_description( _("file dump demuxer") );
+    set_description( _("Filedump demuxer") );
     set_capability( "demux", 0 );
-    add_category_hint( "File", NULL, VLC_FALSE );
-        add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT, 
-                  FILE_LONGTEXT, VLC_FALSE );
-    set_callbacks( Activate, Desactivate );
+    add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT, 
+              FILE_LONGTEXT, VLC_FALSE );
+    set_callbacks( Activate, Deactivate );
     add_shortcut( "dump" );
 vlc_module_end();
 
@@ -79,11 +78,12 @@ static int Activate( vlc_object_t * p_this )
 {
     input_thread_t      *p_input = (input_thread_t *)p_this;
     demux_sys_t         *p_demux;
-
+    vlc_value_t         val;
     char                *psz_name;
 
     /* Set the demux function */
     p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
 
     /* Initialize access plug-in structures. */
     if( p_input->i_mtu == 0 )
@@ -92,7 +92,9 @@ static int Activate( vlc_object_t * p_this )
         p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
     }
     
-    psz_name = config_GetPsz( p_input, "demuxdump-file" );
+    var_Create( p_input, "demuxdump-file", VLC_VAR_FILE|VLC_VAR_DOINHERIT );
+    var_Get( p_input, "demuxdump-file", &val );
+    psz_name = val.psz_string;
     if( !psz_name || !*psz_name )
     {
         msg_Warn( p_input, "no dump file name given" );
@@ -161,9 +163,9 @@ static int Activate( vlc_object_t * p_this )
 }
 
 /*****************************************************************************
- * Desctivate: initializes dump structures
+ * Deactivate: initializes dump structures
  *****************************************************************************/
-static void Desactivate ( vlc_object_t *p_this )
+static void Deactivate ( vlc_object_t *p_this )
 {
     input_thread_t      *p_input = (input_thread_t *)p_this;
     demux_sys_t         *p_demux = (demux_sys_t*)p_input->p_demux_data;