/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
#include <errno.h> /* ENOMEM */
-#include <stdio.h>
#ifdef UNDER_CE
# define _IONBF 0x0004
#endif
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
#define MODE_TEXT 0
#define MODE_HTML 1
#define MODE_SYSLOG 2
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *mode_list[] = { "text", "html"
+static const char *mode_list[] = { "text", "html"
#ifdef HAVE_SYSLOG_H
,"syslog"
#endif
};
-static char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *mode_list_text[] = { N_("Text"), "HTML"
#ifdef HAVE_SYSLOG_H
, "syslog"
#endif
#endif
vlc_module_begin();
- set_shortname( N_( "Logging" ) );
+ set_shortname( _( "Logging" ) );
set_description( _("File logging") );
set_category( CAT_ADVANCED );
VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
- add_string( "rrd-file", NULL, NULL, N_("RRD output file") ,
- N_("Output data for RRDTool in this file" ), VLC_TRUE );
+ add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
+ N_("Output data for RRDTool in this file." ), VLC_TRUE );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
char *psz_mode, *psz_file, *psz_rrd_file;
CONSOLE_INTRO_MSG;
- msg_Info( p_intf, "Using logger..." );
+ msg_Info( p_intf, "using logger..." );
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
if( !psz_file )
{
#ifdef __APPLE__
- char *psz_homedir = p_this->p_vlc->psz_homedir;
+ char *psz_homedir = p_this->p_libvlc->psz_homedir;
- if( !psz_homedir )
+ if( !psz_homedir ) /* XXX: This should never happen */
{
- msg_Err( p_this, "Unable to find home directory" );
+ msg_Err( p_this, "unable to find home directory" );
return -1;
}
psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
/* Open the log file and remove any buffering for the stream */
msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
- p_intf->p_sys->p_file = utf8_fopen( psz_file, "wt" );
+ p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
if( p_intf->p_sys->p_file == NULL )
{
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
p_msg->psz_module, p_msg->psz_msg );
else
syslog( i_priority, "%s: %s", p_msg->psz_module, p_msg->psz_msg );
-
+
}
#endif
static void DoRRD( intf_thread_t *p_intf )
{
playlist_t *p_playlist;
- float f_input_bitrate;
if( mdate() - p_intf->p_sys->last_update < 1000000 )
return;
p_intf->p_sys->last_update = mdate();
lldiv_t dout = lldiv( p_playlist->p_stats->f_output_bitrate * 1000000,
1000 );
fprintf( p_intf->p_sys->p_rrd,
- I64Fi":"I64Fd".%03u:"I64Fd".%03u:"I64Fd".%03u\n",
+ I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n",
p_intf->p_sys->last_update/1000000,
din.quot, (unsigned int)din.rem,
ddm.quot, (unsigned int)ddm.rem,