Commit 6dad9cd7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

libvlc_stats: use VLC_OBJECT to remove a bunch of warnings

parent f8025434
...@@ -1752,7 +1752,7 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) ...@@ -1752,7 +1752,7 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
{ {
p_block = p_access->pf_block( p_access ); p_block = p_access->pf_block( p_access );
if( pb_eof ) *pb_eof = p_access->info.b_eof; if( pb_eof ) *pb_eof = p_access->info.b_eof;
if( p_input && p_block && libvlc_stats (VLC_OBJECT(p_access)) ) if( p_input && p_block && libvlc_stats (p_access) )
{ {
vlc_mutex_lock( &p_input->p->counters.counters_lock ); vlc_mutex_lock( &p_input->p->counters.counters_lock );
stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, stats_UpdateInteger( s, p_input->p->counters.p_read_bytes,
......
...@@ -242,10 +242,7 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) ...@@ -242,10 +242,7 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
return (libvlc_priv_t *)(libvlc + 1); return (libvlc_priv_t *)(libvlc + 1);
} }
static inline bool libvlc_stats (vlc_object_t *obj) #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)
{
return libvlc_priv (obj->p_libvlc)->b_stats;
}
/** /**
* LibVLC "main module" configuration settings array. * LibVLC "main module" configuration settings array.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment