X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_filter%2Frecord.c;h=2b6bd78076d18176c21b506374efcbb74ed875bf;hb=5ad6561ceab66b046b648e7651ed63c071d6012d;hp=a87dedd4a00274679e758fb9e9db55ba44dfea98;hpb=543574fd1d30e5be90ec4adcc9d15046c90af350;p=vlc diff --git a/modules/access_filter/record.c b/modules/access_filter/record.c index a87dedd4a0..2b6bd78076 100644 --- a/modules/access_filter/record.c +++ b/modules/access_filter/record.c @@ -1,7 +1,7 @@ /***************************************************************************** * record.c ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2006 the VideoLAN team * $Id$ * * Author: Laurent Aimar @@ -24,14 +24,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include +#include #include "vlc_keys.h" #include +#include #include #include @@ -41,21 +47,22 @@ #define RECORD_PATH_TXT N_("Record directory") #define RECORD_PATH_LONGTXT N_( \ - "Allows you to specify the directory where the record will be stored" ) + "Directory where the record will be stored." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( _("Record") ); - set_description( _("Record") ); + set_shortname( N_("Record") ); + set_description( N_("Record") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); set_capability( "access_filter", 0 ); add_shortcut( "record" ); add_directory( "record-path", NULL, NULL, - RECORD_PATH_TXT, RECORD_PATH_LONGTXT, VLC_TRUE ); + RECORD_PATH_TXT, RECORD_PATH_LONGTXT, true ); + change_unsafe(); set_callbacks( Open, Close ); @@ -66,7 +73,7 @@ vlc_module_end(); *****************************************************************************/ static block_t *Block ( access_t * ); -static int Read ( access_t *, uint8_t *, int ); +static ssize_t Read ( access_t *, uint8_t *, size_t ); static int Control( access_t *, int i_query, va_list args ); static int Seek ( access_t *, int64_t ); @@ -77,10 +84,10 @@ static int EventKey( vlc_object_t *, char const *, struct access_sys_t { - vlc_bool_t b_dump; + bool b_dump; char *psz_path; - char *psz_ext; + const char *psz_ext; char *psz_file; int64_t i_size; FILE *f; @@ -101,7 +108,7 @@ static inline void PreUpdateFlags( access_t *p_access ) static inline void PostUpdateFlags( access_t *p_access ) { access_t *p_src = p_access->p_source; - /* */ + p_access->info = p_src->info; p_access->p_sys->i_update_sav = p_access->info.i_update; } @@ -117,24 +124,22 @@ static int Open( vlc_object_t *p_this ) access_sys_t *p_sys; char *psz; - /* */ p_access->pf_read = p_src->pf_read ? Read : NULL; p_access->pf_block = p_src->pf_block ? Block : NULL; p_access->pf_seek = p_src->pf_seek ? Seek : NULL; p_access->pf_control = Control; - /* */ p_access->info = p_src->info; - /* */ p_access->p_sys = p_sys = malloc( sizeof( access_t ) ); + if( !p_sys ) return VLC_ENOMEM; /* */ p_sys->f = NULL; p_sys->i_size = 0; p_sys->psz_file = NULL; p_sys->psz_ext = "dat"; - p_sys->b_dump = VLC_FALSE; + p_sys->b_dump = false; p_sys->p_vout = NULL; p_sys->i_vout_chan = -1; p_sys->i_update_sav = p_access->info.i_update; @@ -147,14 +152,13 @@ static int Open( vlc_object_t *p_this ) if( *psz == '\0' ) { free( psz ); - if( p_access->p_vlc->psz_homedir ) - psz = strdup( p_access->p_vlc->psz_homedir ); + psz = strdup( config_GetHomeDir() ); } p_sys->psz_path = psz; msg_Dbg( p_access, "Record access filter path %s", psz ); /* catch all key event */ - var_AddCallback( p_access->p_vlc, "key-pressed", EventKey, p_access ); + var_AddCallback( p_access->p_libvlc, "key-action", EventKey, p_access ); return VLC_SUCCESS; } @@ -167,7 +171,7 @@ static void Close( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys = p_access->p_sys; - var_DelCallback( p_access->p_vlc, "key-pressed", EventKey, p_access ); + var_DelCallback( p_access->p_libvlc, "key-action", EventKey, p_access ); if( p_sys->f ) { @@ -187,15 +191,12 @@ static block_t *Block( access_t *p_access ) access_t *p_src = p_access->p_source; block_t *p_block; - /* */ PreUpdateFlags( p_access ); - /* */ p_block = p_src->pf_block( p_src ); if( p_block && p_block->i_buffer ) Dump( p_access, p_block->p_buffer, p_block->i_buffer ); - /* */ PostUpdateFlags( p_access ); return p_block; @@ -204,21 +205,17 @@ static block_t *Block( access_t *p_access ) /***************************************************************************** * *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_t *p_src = p_access->p_source; int i_ret; - /* */ PreUpdateFlags( p_access ); - /* */ i_ret = p_src->pf_read( p_src, p_buffer, i_len ); - if( i_ret > 0 ) Dump( p_access, p_buffer, i_ret ); - /* */ PostUpdateFlags( p_access ); return i_ret; @@ -232,13 +229,10 @@ static int Control( access_t *p_access, int i_query, va_list args ) access_t *p_src = p_access->p_source; int i_ret; - /* */ PreUpdateFlags( p_access ); - /* */ i_ret = p_src->pf_control( p_src, i_query, args ); - /* */ PostUpdateFlags( p_access ); return i_ret; @@ -252,13 +246,10 @@ static int Seek( access_t *p_access, int64_t i_pos ) access_t *p_src = p_access->p_source; int i_ret; - /* */ PreUpdateFlags( p_access ); - /* */ i_ret = p_src->pf_seek( p_src, i_pos ); - /* */ PostUpdateFlags( p_access ); return i_ret; @@ -273,23 +264,15 @@ static int EventKey( vlc_object_t *p_this, char const *psz_var, access_t *p_access = p_data; access_sys_t *p_sys = p_access->p_sys; - struct hotkey *p_hotkeys = p_access->p_vlc->p_hotkeys; - int i_action = -1, i; + (void)psz_var; + (void)oldval; - for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) - { - if( p_hotkeys[i].i_key == newval.i_int ) - { - i_action = p_hotkeys[i].i_action; - } - } - - if( i_action == ACTIONID_RECORD ) + if( newval.i_int == ACTIONID_RECORD ) { if( p_sys->b_dump ) - p_sys->b_dump = VLC_FALSE; + p_sys->b_dump = false; else - p_sys->b_dump = VLC_TRUE; + p_sys->b_dump = true; } return VLC_SUCCESS; @@ -298,7 +281,7 @@ static int EventKey( vlc_object_t *p_this, char const *psz_var, /***************************************************************************** * *****************************************************************************/ -static void Notify( access_t *p_access, vlc_bool_t b_dump ) +static void Notify( access_t *p_access, bool b_dump ) { access_sys_t *p_sys = p_access->p_sys; vout_thread_t *p_vout; @@ -317,9 +300,9 @@ static void Notify( access_t *p_access, vlc_bool_t b_dump ) if( p_sys->i_vout_chan != -1 ) { if( b_dump ) - vout_OSDMessage( p_vout, p_sys->i_vout_chan, "Recording" ); + vout_OSDMessage( p_vout, p_sys->i_vout_chan, _("Recording") ); else - vout_OSDMessage( p_vout, p_sys->i_vout_chan, "Recording done" ); + vout_OSDMessage( p_vout, p_sys->i_vout_chan, _("Recording done") ); } vlc_object_release( p_vout ); } @@ -332,15 +315,14 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer ) access_sys_t *p_sys = p_access->p_sys; int i_write; - /* */ if( !p_sys->b_dump ) { if( p_sys->f ) { - msg_Dbg( p_access, "dumped "I64Fd" kb (%s)", + msg_Dbg( p_access, "dumped %"PRId64" kb (%s)", p_sys->i_size/1024, p_sys->psz_file ); - Notify( p_access, VLC_FALSE ); + Notify( p_access, false ); fclose( p_sys->f ); p_sys->f = NULL; @@ -353,75 +335,102 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer ) return; } - /* */ if( !p_sys->f ) { input_thread_t *p_input; - char *psz_name = NULL; + char *psz_name = NULL, *psz; time_t t = time(NULL); struct tm l; -#ifdef HAVE_LOCALTIME_R if( !localtime_r( &t, &l ) ) memset( &l, 0, sizeof(l) ); -#else - /* Grrr */ - { - struct tm *p_l = localtime( &t ); - if( p_l ) l = *p_l; - else memset( &l, 0, sizeof(l) ); - } -#endif p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); if( p_input ) { - vlc_mutex_lock( &p_input->input.p_item->lock ); - if( p_input->input.p_item->psz_name ) + input_item_t * p_item = input_GetItem( p_input ); + vlc_mutex_lock( &p_item->lock ); + if( p_item->psz_name ) { - char *p = strrchr( p_input->input.p_item->psz_name, '/' ); + char *p = strrchr( p_item->psz_name, '/' ); if( p == NULL ) - p = strrchr( p_input->input.p_item->psz_name, '\\' ); + p = strrchr( p_item->psz_name, '\\' ); if( p == NULL ) - psz_name = strdup( p_input->input.p_item->psz_name ); + psz_name = strdup( p_item->psz_name ); else if( p[1] != '\0' ) psz_name = strdup( &p[1] ); } - vlc_mutex_unlock( &p_input->input.p_item->lock ); + vlc_mutex_unlock( &p_item->lock ); vlc_object_release( p_input ); } - if( psz_name == NULL ) - psz_name = strdup( "Unknown" ); + if( asprintf( &p_sys->psz_file, "%s %d-%d-%d %.2dh%.2dm%.2ds.%s", + ( psz_name != NULL ) ? psz_name : "Unknown", + l.tm_mday, l.tm_mon+1, l.tm_year+1900, + l.tm_hour, l.tm_min, l.tm_sec, + p_sys->psz_ext ) == -1 ) + p_sys->psz_file = NULL; + + free( psz_name ); + if( p_sys->psz_file == NULL ) + { + p_sys->b_dump = false; + return; + } + + /* Remove all forbidden characters (except (back)slashes) */ + for( psz = p_sys->psz_file; *psz; psz++ ) + { + unsigned char c = (unsigned char)*psz; + + /* Even if many OS accept non printable characters, we remove + * them to avoid confusing users */ + if( ( c < 32 ) || ( c == 127 ) ) + *psz = '_'; +#if defined (WIN32) || defined (UNDER_CE) + /* Windows has a lot of forbidden characters, even if it has + * fewer than DOS. */ + if( strchr( "\"*:<>?|", c ) != NULL ) + *psz = '_'; +#endif + } - asprintf( &p_sys->psz_file, "%s/%s %d-%d-%d %.2dh%.2dm%.2ds.%s", - p_sys->psz_path, psz_name, - l.tm_mday, l.tm_mon+1, l.tm_year+1900, - l.tm_hour, l.tm_min, l.tm_sec, - p_sys->psz_ext ); + psz_name = p_sys->psz_file; +#if defined (WIN32) || defined (UNDER_CE) +#define DIR_SEP "\\" +#else +#define DIR_SEP "/" +#endif + if( asprintf( &p_sys->psz_file, "%s" DIR_SEP "%s", + p_sys->psz_path, psz_name ) == -1 ) + p_sys->psz_file = NULL; free( psz_name ); + if( p_sys->psz_file == NULL ) + { + p_sys->b_dump = false; + return; + } msg_Dbg( p_access, "dump in file '%s'", p_sys->psz_file ); p_sys->f = utf8_fopen( p_sys->psz_file, "wb" ); if( p_sys->f == NULL ) { - msg_Err( p_access, "cannot open file '%s' (%s)", - p_sys->psz_file, strerror(errno) ); + msg_Err( p_access, "cannot open file '%s' (%m)", + p_sys->psz_file ); free( p_sys->psz_file ); p_sys->psz_file = NULL; - p_sys->b_dump = VLC_FALSE; + p_sys->b_dump = false; return; } - Notify( p_access, VLC_TRUE ); + Notify( p_access, true ); p_sys->i_size = 0; } - /* */ if( ( i_write = fwrite( p_buffer, 1, i_buffer, p_sys->f ) ) > 0 ) p_sys->i_size += i_write; }