Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / access_output / dummy.c

diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index ca6b4045638e3c7276ab3aba3e3734b3cb410fb5..4a392f780d9076347bb79b9438abec3bf2f5985f 100644 (file)
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dummy.c
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -19,16 +19,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -36,20 +41,21 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-vlc_module_begin();
-    set_description( _("Dummy stream output") );
-    set_capability( "sout access", 0 );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_ACO );
-    add_shortcut( "dummy" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Dummy stream output") )
+    set_shortname( N_( "Dummy" ))
+    set_capability( "sout access", 0 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_ACO )
+    add_shortcut( "dummy" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static int     Write( sout_access_out_t *, block_t * );
+static ssize_t Write( sout_access_out_t *, block_t * );
 static int     Seek ( sout_access_out_t *, off_t  );
 
 /*****************************************************************************
@@ -79,9 +85,9 @@ static void Close( vlc_object_t * p_this )
 /*****************************************************************************
  * Read: standard read on a file descriptor.
  *****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
 {
-    int64_t i_write = 0;
+    size_t i_write = 0;
     block_t *b = p_buffer;
 
     while( b )
@@ -93,6 +99,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
 
     block_ChainRelease( p_buffer );
 
+    (void)p_access;
     return i_write;
 }
 
@@ -101,6 +108,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
  *****************************************************************************/
 static int Seek( sout_access_out_t *p_access, off_t i_pos )
 {
+    (void)p_access; (void)i_pos;
     return 0;
 }