Slovenian translation update by Matej Urbančič

[vlc] / modules / misc / logger.c

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index eb06269595148c5cc67f556cdd073170c3d25603..4229fa22d8281b9863a2ba36e4f8d3b944369a93 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
@@ -86,6 +86,7 @@ struct intf_sys_t
     int i_mode;
     FILE *p_rrd;
     mtime_t last_update;
+    time_t now;  /* timestamp for rrd-log */
 
     FILE *    p_file; /* The log file */
     msg_subscription_t *p_sub;
@@ -110,12 +111,12 @@ static void DoRRD( intf_thread_t *p_intf );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static const char *mode_list[] = { "text", "html"
+static const char *const mode_list[] = { "text", "html"
 #ifdef HAVE_SYSLOG_H
 ,"syslog"
 #endif
 };
-static const char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *const mode_list_text[] = { N_("Text"), "HTML"
 #ifdef HAVE_SYSLOG_H
 , "syslog"
 #endif
@@ -166,10 +167,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-    {
-        msg_Err( p_intf, "out of memory" );
         return -1;
-    }
 
     psz_mode = var_CreateGetString( p_intf, "logmode" );
     if( psz_mode )
@@ -270,6 +268,7 @@ static int Open( vlc_object_t *p_this )
     {
         p_intf->p_sys->p_rrd = utf8_fopen( psz_rrd_file, "w" );
     }
+    free( psz_rrd_file );
 
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
     p_intf->pf_run = Run;
@@ -322,7 +321,7 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static void Run( intf_thread_t *p_intf )
 {
-    while( !p_intf->b_die )
+    while( vlc_object_alive (p_intf) )
     {
         FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
                     p_intf->p_sys->i_mode,
@@ -442,6 +441,7 @@ static void DoRRD( intf_thread_t *p_intf )
 
     if( p_intf->p_libvlc->p_stats )
     {
+        time(&p_intf->p_sys->now);
         lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000,
                              1000 );
         lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
@@ -450,7 +450,7 @@ static void DoRRD( intf_thread_t *p_intf )
                              1000 );
         fprintf( p_intf->p_sys->p_rrd,
                    "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n",
-                   p_intf->p_sys->last_update/1000000,
+                   (uintmax_t)p_intf->p_sys->now,
                    din.quot, (unsigned int)din.rem,
                    ddm.quot, (unsigned int)ddm.rem,
                    dout.quot, (unsigned int)dout.rem );