]> git.sesse.net Git - vlc/blobdiff - modules/access_output/file.c
Improvements to preferences
[vlc] / modules / access_output / file.c
index 57e1abe59ff05b5f6cdc1588ec02833a1bb8ed21..62a1e6d15b6a1109ac53f4746dc926725841d3c7 100644 (file)
@@ -2,7 +2,7 @@
  * file.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.4 2003/03/03 14:21:08 gbazin Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <errno.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
 #include <vlc/sout.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <io.h>
 #endif
 
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static int     Open   ( vlc_object_t * );
-static void    Close  ( vlc_object_t * );
-
-static int     Write( sout_access_out_t *, sout_buffer_t * );
-static int     Seek ( sout_access_out_t *, off_t  );
+/* For those platforms that don't use these */
+#ifndef S_IRGRP
+#   define S_IRGRP 0
+#endif
+#ifndef S_IROTH
+#   define S_IROTH 0
+#endif
+#ifndef STDOUT_FILENO
+#   define STDOUT_FILENO 1
+#endif
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+static int  Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+#define SOUT_CFG_PREFIX "sout-file-"
+#define APPEND_TEXT N_("Append to file")
+#define APPEND_LONGTEXT N_( "Append to file if it exists instead " \
+                            "of replacing it.")
+
 vlc_module_begin();
-    set_description( _("File stream ouput") );
+    set_description( _("File stream output") );
     set_capability( "sout access", 50 );
+    set_category( CAT_SOUT );
+    set_subcategory( SUBCAT_SOUT_ACO );
     add_shortcut( "file" );
+    add_shortcut( "stream" );
+    add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT,
+              VLC_TRUE );
     set_callbacks( Open, Close );
 vlc_module_end();
 
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+    "append", NULL
+};
+
+static int Write( sout_access_out_t *, block_t * );
+static int Seek ( sout_access_out_t *, off_t  );
+static int Read ( sout_access_out_t *, block_t * );
+
 struct sout_access_out_sys_t
 {
-    FILE *p_file;
-
+    int i_handle;
 };
 
 /*****************************************************************************
@@ -73,6 +98,10 @@ struct sout_access_out_sys_t
 static int Open( vlc_object_t *p_this )
 {
     sout_access_out_t   *p_access = (sout_access_out_t*)p_this;
+    int                 i_flags;
+    vlc_value_t         val;
+
+    sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
     if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) )
     {
@@ -80,17 +109,46 @@ static int Open( vlc_object_t *p_this )
         return( VLC_EGENERIC );
     }
 
-    if( !( p_access->p_sys->p_file = fopen( p_access->psz_name, "wb" ) ) )
+    if( !p_access->psz_name )
+    {
+        msg_Err( p_access, "no file name specified" );
+        return VLC_EGENERIC;
+    }
+    i_flags = O_RDWR|O_CREAT;
+
+    var_Get( p_access, SOUT_CFG_PREFIX "append", &val );
+    if( val.b_bool )
+    {
+        i_flags |= O_APPEND;
+    }
+    else
+    {
+        i_flags |= O_TRUNC;
+    }
+    if( !strcmp( p_access->psz_name, "-" ) )
+    {
+        p_access->p_sys->i_handle = STDOUT_FILENO;
+        msg_Dbg( p_access, "using stdout" );
+    }
+    else if( ( p_access->p_sys->i_handle =
+               open( p_access->psz_name, i_flags,
+                     S_IWRITE | S_IREAD | S_IRGRP | S_IROTH ) ) == -1 )
     {
         msg_Err( p_access, "cannot open `%s'", p_access->psz_name );
         free( p_access->p_sys );
         return( VLC_EGENERIC );
     }
 
-    p_access->pf_write        = Write;
-    p_access->pf_seek         = Seek;
+    p_access->pf_write = Write;
+    p_access->pf_read  = Read;
+    p_access->pf_seek  = Seek;
+
+    msg_Dbg( p_access, "file access output opened (`%s')", p_access->psz_name );
+
+    /* Update pace control flag */
+    if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
+        p_access->p_sout->i_out_pace_nocontrol++;
 
-    msg_Info( p_access, "Open: name:`%s'", p_access->psz_name );
     return VLC_SUCCESS;
 }
 
@@ -99,37 +157,58 @@ static int Open( vlc_object_t *p_this )
  *****************************************************************************/
 static void Close( vlc_object_t * p_this )
 {
-    sout_access_out_t   *p_access = (sout_access_out_t*)p_this;
+    sout_access_out_t *p_access = (sout_access_out_t*)p_this;
 
-    if( p_access->p_sys->p_file )
+    if( strcmp( p_access->psz_name, "-" ) )
     {
-        fclose( p_access->p_sys->p_file );
+        if( p_access->p_sys->i_handle )
+        {
+            close( p_access->p_sys->i_handle );
+        }
     }
     free( p_access->p_sys );
 
-    msg_Info( p_access, "Close" );
+    /* Update pace control flag */
+    if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
+        p_access->p_sout->i_out_pace_nocontrol--;
+
+    msg_Dbg( p_access, "file access output closed" );
 }
 
 /*****************************************************************************
  * Read: standard read on a file descriptor.
  *****************************************************************************/
-static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
+static int Read( sout_access_out_t *p_access, block_t *p_buffer )
+{
+    if( strcmp( p_access->psz_name, "-" ) )
+    {
+        return read( p_access->p_sys->i_handle, p_buffer->p_buffer,
+                     p_buffer->i_buffer );
+    }
+
+    msg_Err( p_access, "cannot read while using stdout" );
+    return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * Write: standard write on a file descriptor.
+ *****************************************************************************/
+static int Write( sout_access_out_t *p_access, block_t *p_buffer )
 {
     size_t i_write = 0;
 
-    do
+    while( p_buffer )
     {
-        sout_buffer_t *p_next;
+        block_t *p_next = p_buffer->p_next;;
 
-        i_write += fwrite( p_buffer->p_buffer, 1, p_buffer->i_size,
-                           p_access->p_sys->p_file );
-        p_next = p_buffer->p_next;
-        sout_BufferDelete( p_access->p_sout, p_buffer );
-        p_buffer = p_next;
+        i_write += write( p_access->p_sys->i_handle,
+                          p_buffer->p_buffer, p_buffer->i_buffer );
+        block_Release( p_buffer );
 
-    } while( p_buffer );
+        p_buffer = p_next;
+    }
 
-    return( i_write );
+    return i_write;
 }
 
 /*****************************************************************************
@@ -137,10 +216,17 @@ static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
  *****************************************************************************/
 static int Seek( sout_access_out_t *p_access, off_t i_pos )
 {
-
-    msg_Dbg( p_access, "Seek: pos:"I64Fd, (int64_t)i_pos );
-    return( fseek( p_access->p_sys->p_file, i_pos, SEEK_SET ) );
+    if( strcmp( p_access->psz_name, "-" ) )
+    {
+#if defined( WIN32 ) && !defined( UNDER_CE )
+        return( _lseeki64( p_access->p_sys->i_handle, i_pos, SEEK_SET ) );
+#else
+        return( lseek( p_access->p_sys->i_handle, i_pos, SEEK_SET ) );
+#endif
+    }
+    else
+    {
+        msg_Err( p_access, "cannot seek while using stdout" );
+        return VLC_EGENERIC;
+    }
 }
-
-
-