libvlccore: vlc_thread_cancel() tangled object API

diff --git a/src/libvlc.h b/src/libvlc.h
index dfcaecf33139b269db074871ffeef99b19d613f5..5e476b2717d7ed816f2ac5b532583a955728986a 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -52,6 +52,10 @@ void vlc_refcheck (vlc_object_t *obj);
 # define vlc_refcheck( obj ) (void)0
 #endif
 
+/* Hopefully, no need to export this. There is a new thread API instead. */
+void vlc_thread_cancel (vlc_object_t *);
+
+
 /*
  * CPU capabilities
  */

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 6c94811e32b6127c31327c36bc35c43f73cb90c0..af65ddb4a0c0868b977dd3344619f9e1c246f634 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -829,3 +829,10 @@ error:
     p_priv->b_thread = false;
 }
 
+void vlc_thread_cancel (vlc_object_t *obj)
+{
+    vlc_object_internals_t *priv = vlc_internals (obj);
+
+    if (priv->b_thread)
+        vlc_cancel (priv->thread_id);
+}