media list player: return NothingSpecial on is_playing if media instance is null

[vlc] / src / control / libvlc_internal.h

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 3cb97d6ef1adb54af778dc6cc2e6000559b170e9..c079f8dba9f7fe5787d477ed12752259c32f4cc0 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -36,6 +36,10 @@
 
 #include <vlc_common.h>
 
+/* Note well: this header is included from LibVLC core.
+ * Therefore, static inline functions MUST NOT call LibVLC functions here
+ * (this can cause linkage failure on some platforms). */
+
 /***************************************************************************
  * Internal creation and destruction functions
  ***************************************************************************/
@@ -46,6 +50,7 @@ VLC_EXPORT (void, libvlc_InternalDestroy, ( libvlc_int_t * ) );
 
 VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) );
 VLC_EXPORT (void, libvlc_InternalWait, ( libvlc_int_t * ) );
+VLC_EXPORT (void, libvlc_SetExitHandler, ( libvlc_int_t *, void (*) (void *), void * ) );
 
 typedef void (*libvlc_vlm_release_func_t)( libvlc_instance_t * ) ;
 
@@ -99,15 +104,6 @@ void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager,
                                libvlc_callback_t pf_callback,
                                void *p_user_data );
 
-/* Exception shorcuts */
-
-#define RAISENULL( ... ) { libvlc_printerr(__VA_ARGS__); \
-                           libvlc_exception_raise( p_e ); \
-                           return NULL; }
-#define RAISEZERO( ... ) { libvlc_printerr(__VA_ARGS__); \
-                           libvlc_exception_raise( p_e ); \
-                           return 0; }
-
 static inline libvlc_time_t from_mtime(mtime_t time)
 {
     return (time + 500ULL)/ 1000ULL;