[vlc-commits] libvlc: remove deprecated libvlc_wait()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  9 12:50:40 2018 +0300| [4de2f60e9a233b839ee735810ad7374c645c95cf] | committer: Rémi Denis-Courmont

libvlc: remove deprecated libvlc_wait()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4de2f60e9a233b839ee735810ad7374c645c95cf
---

 include/vlc/deprecated.h | 19 -------------------
 include/vlc/libvlc.h     |  1 -
 lib/core.c               | 16 ----------------
 lib/libvlc.sym           |  1 -
 4 files changed, 37 deletions(-)

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 6eecd15ec2..8edc226d29 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -155,25 +155,6 @@ LIBVLC_DEPRECATED int
 /** @}*/
 
 /**
- * \ingroup libvlc libvlc_core
- * @{
- */
-
-/**
- * Waits until an interface causes the instance to exit.
- * You should start at least one interface first, using libvlc_add_intf().
- *
- * \param p_instance the instance
- * \warning This function wastes one thread doing basically nothing.
- * libvlc_set_exit_handler() should be used instead.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_wait( libvlc_instance_t *p_instance );
-
-
-/** @}*/
-
-/**
  * \ingroup libvlc
  * \defgroup libvlc_playlist LibVLC playlist (legacy)
  * @deprecated Use @ref libvlc_media_list instead.
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 78afe99f16..b6ee2efc50 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -219,7 +219,6 @@ int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name );
  * \param cb callback to invoke when LibVLC wants to exit,
  *           or NULL to disable the exit handler (as by default)
  * \param opaque data pointer for the callback
- * \warning This function and libvlc_wait() cannot be used at the same time.
  */
 LIBVLC_API
 void libvlc_set_exit_handler( libvlc_instance_t *p_instance,
diff --git a/lib/core.c b/lib/core.c
index 5e8c614c83..0178a83d44 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -115,22 +115,6 @@ void libvlc_set_exit_handler( libvlc_instance_t *p_i, void (*cb) (void *),
     libvlc_SetExitHandler( p_libvlc, cb, data );
 }
 
-static void libvlc_wait_wakeup( void *data )
-{
-    vlc_sem_post( data );
-}
-
-void libvlc_wait( libvlc_instance_t *p_i )
-{
-    vlc_sem_t sem;
-
-    vlc_sem_init( &sem, 0 );
-    libvlc_set_exit_handler( p_i, libvlc_wait_wakeup, &sem );
-    vlc_sem_wait( &sem );
-    libvlc_set_exit_handler( p_i, NULL, NULL );
-    vlc_sem_destroy( &sem );
-}
-
 void libvlc_set_user_agent (libvlc_instance_t *p_i,
                             const char *name, const char *http)
 {
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index b43076bf22..cdbcec9dc9 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -284,7 +284,6 @@ libvlc_vlm_set_output
 libvlc_vlm_show_media
 libvlc_vlm_stop_media
 libvlc_set_exit_handler
-libvlc_wait
 libvlc_audio_filter_list_get
 libvlc_video_filter_list_get
 libvlc_module_description_list_release