Fix [10fcb9f9c3c73d13340c0bd4153fc4c9c87b7186] (win doesn't have setenv).

[vlc] / modules / access_filter / record.c

diff --git a/modules/access_filter/record.c b/modules/access_filter/record.c
index a4c8459d60a6efe6e3b68a31eeb5daac3bf18833..2b6bd78076d18176c21b506374efcbb74ed875bf 100644 (file)
--- a/modules/access_filter/record.c
+++ b/modules/access_filter/record.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -52,15 +53,15 @@ 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 );
@@ -83,7 +84,7 @@ static int EventKey( vlc_object_t *, char const *,
 
 struct access_sys_t
 {
-    vlc_bool_t b_dump;
+    bool b_dump;
 
     char *psz_path;
     const char *psz_ext;
@@ -107,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;
 }
@@ -123,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;
@@ -153,14 +152,13 @@ static int Open( vlc_object_t *p_this )
     if( *psz == '\0' )
     {
         free( psz );
-        if( p_access->p_libvlc->psz_homedir ) /* XXX: This should never happen */
-            psz = strdup( p_access->p_libvlc->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_libvlc, "key-pressed", EventKey, p_access );
+    var_AddCallback( p_access->p_libvlc, "key-action", EventKey, p_access );
 
     return VLC_SUCCESS;
 }
@@ -173,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_libvlc, "key-pressed", EventKey, p_access );
+    var_DelCallback( p_access->p_libvlc, "key-action", EventKey, p_access );
 
     if( p_sys->f )
     {
@@ -193,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;
@@ -215,16 +210,12 @@ 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;
@@ -238,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;
@@ -258,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;
@@ -279,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_libvlc->p_hotkeys;
-    int i_action = -1, i;
-
-    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;
-        }
-    }
+    (void)psz_var;
+    (void)oldval;
 
-    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;
@@ -304,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;
@@ -338,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;
@@ -359,7 +335,6 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer )
         return;
     }
 
-    /* */
     if( !p_sys->f )
     {
         input_thread_t *p_input;
@@ -367,16 +342,7 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer )
         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 )
@@ -409,7 +375,7 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer )
         free( psz_name );
         if( p_sys->psz_file == NULL )
         {
-            p_sys->b_dump = VLC_FALSE;
+            p_sys->b_dump = false;
             return;
         }
 
@@ -443,7 +409,7 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer )
         free( psz_name );
         if( p_sys->psz_file == NULL )
         {
-            p_sys->b_dump = VLC_FALSE;
+            p_sys->b_dump = false;
             return;
         }
 
@@ -456,16 +422,15 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer )
                      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;
 }