aout: fix infinite loop on error (fixes #7711)

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 4eec20bc48fdd931e7db59aaea8560a1ea593f40..4392f48af29c6bfb4b58c9222a2ea9e6b0dd1c50 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -41,8 +41,12 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc);
  */
 void system_Init      ( void );
 void system_Configure ( libvlc_int_t *, int, const char *const [] );
-void system_End       ( void );
-
+#if defined(WIN32) || defined(__OS2__)
+void system_End(void);
+#ifndef __OS2__
+size_t EnumClockSource( vlc_object_t *, const char *, char ***, char *** );
+#endif
+#endif
 void vlc_CPU_init(void);
 void vlc_CPU_dump(vlc_object_t *);
 
@@ -54,6 +58,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 );
 
@@ -62,7 +68,7 @@ void vlc_threads_setup (libvlc_int_t *);
 void vlc_trace (const char *fn, const char *file, unsigned line);
 #define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)
 
-#if defined (LIBVLC_USE_PTHREAD) && !defined (NDEBUG)
+#if (defined (LIBVLC_USE_PTHREAD) || defined(__ANDROID__)) && !defined (NDEBUG)
 void vlc_assert_locked (vlc_mutex_t *);
 #else
 # define vlc_assert_locked( m ) (void)m
@@ -76,7 +82,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 * );
@@ -121,43 +126,12 @@ void vlc_object_set_destructor (vlc_object_t *, vlc_destructor_t);
  */
 module_t *module_find_by_shortcut (const char *psz_shortcut);
 
-/**
- * Private LibVLC data for each object.
- */
-typedef struct vlc_object_internals vlc_object_internals_t;
-
-struct vlc_object_internals
-{
-    char           *psz_name; /* given name */
-
-    /* Object variables */
-    void           *var_root;
-    vlc_mutex_t     var_lock;
-    vlc_cond_t      var_wait;
-
-    /* Objects thread synchronization */
-    int             pipes[2];
-
-    /* Objects management */
-    vlc_spinlock_t   ref_spin;
-    unsigned         i_refcount;
-    vlc_destructor_t pf_destructor;
-
-    /* Objects tree structure */
-    vlc_object_internals_t *next;  /* next sibling */
-    vlc_object_internals_t *prev;  /* previous sibling */
-    vlc_object_internals_t *first; /* first child */
-};
-
 #define ZOOM_SECTION N_("Zoom")
 #define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
 #define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
 #define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
 #define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
 
-#define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1)
-#define vlc_externals( priv ) ((vlc_object_t *)((priv) + 1))
-
 typedef struct sap_handler_t sap_handler_t;
 
 /**
@@ -175,7 +149,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