wasapi: do not assume mdate() returns the performance counter

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 0c551fea3b61cda1ff3b140627afddb97ab7f982..5d744507043671f9e72dadc995076d157c3bc037 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -54,6 +54,8 @@ void vlc_CPU_dump(vlc_object_t *);
 int vlc_clone_detach (vlc_thread_t *, void *(*)(void *), void *, int);
 
 int vlc_object_waitpipe (vlc_object_t *obj);
+void vlc_object_kill (vlc_object_t *) VLC_DEPRECATED;
+#define vlc_object_kill(o) vlc_object_kill(VLC_OBJECT(o))
 
 int vlc_set_priority( vlc_thread_t, int );
 
@@ -76,7 +78,6 @@ typedef struct vlc_exit
     vlc_mutex_t lock;
     void (*handler) (void *);
     void *opaque;
-    bool killed;
 } vlc_exit_t;
 
 void vlc_ExitInit( vlc_exit_t * );
@@ -119,8 +120,6 @@ void vlc_object_set_destructor (vlc_object_t *, vlc_destructor_t);
 /*
  * To be cleaned-up module stuff:
  */
-extern char *psz_vlcpath;
-
 module_t *module_find_by_shortcut (const char *psz_shortcut);
 
 /**
@@ -177,7 +176,6 @@ typedef struct libvlc_priv_t
     bool               b_stats;     ///< Whether to collect stats
 
     /* Singleton objects */
-    module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     playlist_t        *p_playlist; ///< the playlist singleton
     struct media_library_t *p_ml;    ///< the ML singleton
     vlc_mutex_t       ml_lock; ///< Mutex for ML creation
@@ -208,12 +206,6 @@ void intf_DestroyAll( libvlc_int_t * );
 
 #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)
 
-/**
- * LibVLC "main module" configuration settings array.
- */
-extern module_config_t libvlc_config[];
-extern const size_t libvlc_config_count;
-
 /*
  * Variables stuff
  */
@@ -230,13 +222,12 @@ enum
 
 typedef struct counter_sample_t
 {
-    vlc_value_t value;
-    mtime_t     date;
+    uint64_t value;
+    mtime_t  date;
 } counter_sample_t;
 
 typedef struct counter_t
 {
-    int                 i_type;
     int                 i_compute_type;
     int                 i_samples;
     counter_sample_t ** pp_samples;
@@ -267,58 +258,10 @@ enum
     STATS_LOST_PICTURES,
 };
 
-int stats_Update (counter_t *, vlc_value_t, vlc_value_t *);
-counter_t * stats_CounterCreate (int, int);
-int stats_Get (counter_t *, vlc_value_t*);
-
+counter_t * stats_CounterCreate (int);
+void stats_Update (counter_t *, uint64_t, uint64_t *);
 void stats_CounterClean (counter_t * );
 
-static inline int stats_GetInteger( counter_t *p_counter, int64_t *value )
-{
-    int i_ret;
-    vlc_value_t val; val.i_int = 0;
-    if( !p_counter ) return VLC_EGENERIC;
-    i_ret = stats_Get( p_counter, &val );
-    *value = val.i_int;
-    return i_ret;
-}
-
-static inline int stats_GetFloat( counter_t *p_counter, float *value )
-{
-    int i_ret;
-    vlc_value_t val; val.f_float = 0.0;
-    if( !p_counter ) return VLC_EGENERIC;
-    i_ret = stats_Get( p_counter, &val );
-    *value = val.f_float;
-    return i_ret;
-}
-
-static inline int stats_UpdateInteger( counter_t *p_co, int i, int *pi_new )
-{
-    int i_ret;
-    vlc_value_t val;
-    vlc_value_t new_val; new_val.i_int = 0;
-    if( !p_co ) return VLC_EGENERIC;
-    val.i_int = i;
-    i_ret = stats_Update( p_co, val, &new_val );
-    if( pi_new )
-        *pi_new = new_val.i_int;
-    return i_ret;
-}
-
-static inline int stats_UpdateFloat( counter_t *p_co, float f, float *pf_new )
-{
-    vlc_value_t val;
-    int i_ret;
-    vlc_value_t new_val;new_val.f_float = 0.0;
-    if( !p_co ) return VLC_EGENERIC;
-    val.f_float = f;
-    i_ret =  stats_Update( p_co, val, &new_val );
-    if( pf_new )
-        *pf_new = new_val.f_float;
-    return i_ret;
-}
-
 void stats_ComputeInputStats(input_thread_t*, input_stats_t*);
 void stats_ReinitInputStats(input_stats_t *);