DASH: remove unnecessary includes and other trivial fixes

[vlc] / include / vlc_xlib.h

diff --git a/include/vlc_xlib.h b/include/vlc_xlib.h
index e4f0a0c6c72c0ff11129eeda0222b9f0ab7cbc83..a1d8de30f9f39a57daa87dfda4e50b53c216f828 100644 (file)
--- a/include/vlc_xlib.h
+++ b/include/vlc_xlib.h
@@ -21,21 +21,36 @@
 #ifndef VLC_XLIB_H
 # define VLC_XLIB_H 1
 
-# include <vlc_common.h>
+# include <stdio.h>
+# include <stdlib.h>
 # include <X11/Xlib.h>
+# include <X11/Xlibint.h>
 
 static inline bool vlc_xlib_init (vlc_object_t *obj)
 {
+    if (!var_InheritBool (obj, "xlib"))
+        return false;
+
     bool ok = false;
 
-    if (var_InheritBool (obj, "xlib"))
-    {
-        /* XInitThreads() can be called multiple times,
-         * but it is not reentrant. */
-        vlc_global_lock (VLC_XLIB_MUTEX);
-        ok = XInitThreads () != 0;
-        vlc_global_unlock (VLC_XLIB_MUTEX);
-    }
+    /* XInitThreads() can be called multiple times,
+     * but it is not reentrant, so we need this global lock. */
+    vlc_global_lock (VLC_XLIB_MUTEX);
+
+    if (_Xglobal_lock == NULL && unlikely(_XErrorFunction != NULL))
+        /* (_Xglobal_lock == NULL) => Xlib threads not initialized */
+        /* (_XErrorFunction != NULL) => Xlib already in use */
+        fprintf (stderr, "%s:%u:%s: Xlib not initialized for threads.\n"
+                 "This process is probably using LibVLC incorrectly.\n"
+                 "Pass \"--no-xlib\" to libvlc_new() to fix this.\n",
+                 __FILE__, __LINE__, __func__);
+    else if (XInitThreads ())
+        ok = true;
+
+    vlc_global_unlock (VLC_XLIB_MUTEX);
+
+    if (!ok)
+        msg_Err (obj, "Xlib not initialized for threads");
     return ok;
 }