[vlc-devel] [RFC PATCH] libvlc: clean up deprecated functions
Thomas Guillem
thomas at gllm.fr
Wed Apr 20 11:44:56 CEST 2016
This commit move every deprecated functions to vlc/deprecated.h.
Moved functions still belong to their original doxygen group. Except legacy
logs functions that now belongs to their own deprecated group (libvlc_core
libvlc_log_deprecated).
In Doxygen, every deprecated functions appears now at the end of each groups
(since deprecated.h is the last file included).
What I'm not sure about:
- This commit may break compilation if developers didn't include
vlc/deprecated.h header (so, if they didn't include vlc/vlc.h).
- In order to build deprecated functions for libvlc, C files must now include
vlc/vlc.h to include deprecated prototypes.
---
include/vlc/deprecated.h | 354 +++++++++++++++++++++++++++++++++-
include/vlc/libvlc.h | 108 -----------
include/vlc/libvlc_media.h | 65 +------
include/vlc/libvlc_media_discoverer.h | 7 -
include/vlc/libvlc_media_list.h | 4 -
include/vlc/libvlc_media_player.h | 116 -----------
include/vlc/libvlc_structures.h | 2 +-
lib/core.c | 2 +-
lib/log.c | 2 +-
lib/media_library.c | 6 +-
lib/playlist.c | 6 +-
11 files changed, 361 insertions(+), 311 deletions(-)
diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index fdda1e2..14b7428 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -29,8 +29,360 @@
extern "C" {
# endif
-/** \defgroup libvlc_playlist LibVLC playlist (legacy)
+/**
+ * \ingroup libvlc libvlc_media_player
+ * @{
+ */
+
+/**
+ * Get movie fps rate
+ *
+ * This function is provided for backward compatibility. It cannot deal with
+ * multiple video tracks. In LibVLC versions prior to 3.0, it would also fail
+ * if the file format did not convey the frame rate explicitly.
+ *
+ * \deprecated Consider using libvlc_media_tracks_get() instead.
+ *
+ * \param p_mi the Media Player
+ * \return frames per second (fps) for this playing movie, or 0 if unspecified
+ */
+LIBVLC_DEPRECATED
+LIBVLC_API float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi );
+
+/** end bug */
+
+/**
+ * \deprecated Use libvlc_media_player_set_nsobject() instead
+ */
+LIBVLC_DEPRECATED
+LIBVLC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable );
+
+/**
+ * \deprecated Use libvlc_media_player_get_nsobject() instead
+ */
+LIBVLC_DEPRECATED
+LIBVLC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi );
+
+/**
+ * \deprecated Use libvlc_track_description_list_release() instead
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
+
+/** @}*/
+
+/**
+ * \ingroup libvlc libvlc_video
+ * @{
+ */
+
+/**
+ * Get current video height.
+ * \deprecated Use libvlc_video_get_size() instead.
+ *
+ * \param p_mi the media player
+ * \return the video pixel height or 0 if not applicable
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+int libvlc_video_get_height( libvlc_media_player_t *p_mi );
+
+/**
+ * Get current video width.
+ * \deprecated Use libvlc_video_get_size() instead.
+ *
+ * \param p_mi the media player
+ * \return the video pixel width or 0 if not applicable
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+int libvlc_video_get_width( libvlc_media_player_t *p_mi );
+
+/**
+ * Get the description of available titles.
+ *
+ * \param p_mi the media player
+ * \return list containing description of available titles.
+ * It must be freed with libvlc_track_description_list_release()
+ */
+LIBVLC_DEPRECATED LIBVLC_API libvlc_track_description_t *
+ libvlc_video_get_title_description( libvlc_media_player_t *p_mi );
+
+/**
+ * Get the description of available chapters for specific title.
+ *
+ * \param p_mi the media player
+ * \param i_title selected title
+ * \return list containing description of available chapter for title i_title.
+ * It must be freed with libvlc_track_description_list_release()
+ */
+LIBVLC_DEPRECATED LIBVLC_API libvlc_track_description_t *
+ libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi, int i_title );
+
+/** @}*/
+
+/**
+ * \ingroup libvlc libvlc_audio
+ * @{
+ */
+
+/**
+ * Backward compatibility stub. Do not use in new code.
+ * \deprecated Use libvlc_audio_output_device_list_get() instead.
+ * \return always 0.
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+int libvlc_audio_output_device_count( libvlc_instance_t *, const char * );
+
+/**
+ * Backward compatibility stub. Do not use in new code.
+ * \deprecated Use libvlc_audio_output_device_list_get() instead.
+ * \return always NULL.
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+char *libvlc_audio_output_device_longname( libvlc_instance_t *, const char *,
+ int );
+
+/**
+ * Backward compatibility stub. Do not use in new code.
+ * \deprecated Use libvlc_audio_output_device_list_get() instead.
+ * \return always NULL.
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+char *libvlc_audio_output_device_id( libvlc_instance_t *, const char *, int );
+
+/**
+ * Stub for backward compatibility.
+ * \return always -1.
+ */
+LIBVLC_DEPRECATED
+LIBVLC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
+
+/**
+ * Stub for backward compatibility.
+ */
+LIBVLC_DEPRECATED
+LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *,
+ int );
+
+/** @}*/
+
+/**
+ * \ingroup libvlc libvlc_media
+ * @{
+ */
+
+/**
+ * Parse a media.
+ *
+ * This fetches (local) art, meta data and tracks information.
+ * The method is the asynchronous of libvlc_media_parse().
+ *
+ * To track when this is over you can listen to libvlc_MediaParsedChanged
+ * event. However if the media was already parsed you will not receive this
+ * event.
+ *
+ * \deprecated You can't be sure to receive the libvlc_MediaParsedChanged
+ * event (you can wait indefinitely for this event).
+ * Use libvlc_media_parse_with_options() instead
+ *
+ * \see libvlc_media_parse
+ * \see libvlc_MediaParsedChanged
+ * \see libvlc_media_get_meta
+ * \see libvlc_media_get_tracks_info
+ *
+ * \param p_md media descriptor object
+ */
+LIBVLC_DEPRECATED LIBVLC_API void
+libvlc_media_parse_async( libvlc_media_t *p_md );
+
+/**
+ * Return true is the media descriptor object is parsed
+ *
+ * \deprecated This can return true in case of failure.
+ * Use libvlc_media_get_parsed_status() instead
+ *
+ * \see libvlc_MediaParsedChanged
+ *
+ * \param p_md media descriptor object
+ * \return true if media object has been parsed otherwise it returns false
+ *
+ * \libvlc_return_bool
+ */
+LIBVLC_DEPRECATED LIBVLC_API int
+ libvlc_media_is_parsed( libvlc_media_t *p_md );
+
+/**
+ * Get media descriptor's elementary streams description
+ *
+ * Note, you need to call libvlc_media_parse() or play the media at least once
+ * before calling this function.
+ * Not doing this will result in an empty array.
+ *
+ * \deprecated Use libvlc_media_tracks_get() instead
+ *
+ * \param p_md media descriptor object
+ * \param tracks address to store an allocated array of Elementary Streams
+ * descriptions (must be freed by the caller) [OUT]
+ *
+ * \return the number of Elementary Streams
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+int libvlc_media_get_tracks_info( libvlc_media_t *p_md,
+ libvlc_media_track_info_t **tracks );
+
+/** @}*/
+
+/**
+ * \ingroup libvlc libvlc_media_list
+ * @{
+ */
+
+LIBVLC_DEPRECATED int
+ libvlc_media_list_add_file_content( libvlc_media_list_t * p_ml,
+ const char * psz_uri );
+
+/** @}*/
+
+/**
+ * \ingroup libvlc libvlc_media_discoverer
+ * @{
+ */
+
+/**
+ * \deprecated Use libvlc_media_discoverer_new() and libvlc_media_discoverer_start().
+ */
+LIBVLC_DEPRECATED LIBVLC_API libvlc_media_discoverer_t *
+libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
+ const char * psz_name );
+
+/** @}*/
+
+/**
+ * \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_core
+ * \defgroup libvlc_log_deprecated LibVLC logging (legacy)
+ * @{
+ */
+
+/**
+ * Always returns minus one.
+ * This function is only provided for backward compatibility.
+ *
+ * \param p_instance ignored
+ * \return always -1
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
+
+/**
+ * This function does nothing.
+ * It is only provided for backward compatibility.
+ *
+ * \param p_instance ignored
+ * \param level ignored
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
+
+/**
+ * This function does nothing useful.
+ * It is only provided for backward compatibility.
+ *
+ * \param p_instance libvlc instance
+ * \return an unique pointer or NULL on error
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance );
+
+/**
+ * Frees memory allocated by libvlc_log_open().
+ *
+ * \param p_log libvlc log instance or NULL
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_log_close( libvlc_log_t *p_log );
+
+/**
+ * Always returns zero.
+ * This function is only provided for backward compatibility.
+ *
+ * \param p_log ignored
+ * \return always zero
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+unsigned libvlc_log_count( const libvlc_log_t *p_log );
+
+/**
+ * This function does nothing.
+ * It is only provided for backward compatibility.
+ *
+ * \param p_log ignored
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_log_clear( libvlc_log_t *p_log );
+
+/**
+ * This function does nothing useful.
+ * It is only provided for backward compatibility.
+ *
+ * \param p_log ignored
+ * \return an unique pointer or NULL on error or if the parameter was NULL
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log );
+
+/**
+ * Frees memory allocated by libvlc_log_get_iterator().
+ *
+ * \param p_iter libvlc log iterator or NULL
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
+
+/**
+ * Always returns zero.
+ * This function is only provided for backward compatibility.
+ *
+ * \param p_iter ignored
+ * \return always zero
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter );
+
+/**
+ * Always returns NULL.
+ * This function is only provided for backward compatibility.
+ *
+ * \param p_iter libvlc log iterator or NULL
+ * \param p_buf ignored
+ * \return always NULL
+ */
+LIBVLC_DEPRECATED LIBVLC_API
+libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
+ libvlc_log_message_t *p_buf );
+
+/** @}*/
+
+/**
* \ingroup libvlc
+ * \defgroup libvlc_playlist LibVLC playlist (legacy)
* @deprecated Use @ref libvlc_media_list instead.
* @{
* \file
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 68023ef..e2305ea 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -213,17 +213,6 @@ void libvlc_set_exit_handler( libvlc_instance_t *p_instance,
void (*cb) (void *), void *opaque );
/**
- * 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 );
-
-/**
* Sets the application name. LibVLC passes this as the user agent string
* when a protocol requires it.
*
@@ -471,103 +460,6 @@ LIBVLC_API void libvlc_log_set( libvlc_instance_t *,
*/
LIBVLC_API void libvlc_log_set_file( libvlc_instance_t *, FILE *stream );
-/**
- * Always returns minus one.
- * This function is only provided for backward compatibility.
- *
- * \param p_instance ignored
- * \return always -1
- */
-LIBVLC_DEPRECATED LIBVLC_API
-unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
-
-/**
- * This function does nothing.
- * It is only provided for backward compatibility.
- *
- * \param p_instance ignored
- * \param level ignored
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
-
-/**
- * This function does nothing useful.
- * It is only provided for backward compatibility.
- *
- * \param p_instance libvlc instance
- * \return an unique pointer or NULL on error
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance );
-
-/**
- * Frees memory allocated by libvlc_log_open().
- *
- * \param p_log libvlc log instance or NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_close( libvlc_log_t *p_log );
-
-/**
- * Always returns zero.
- * This function is only provided for backward compatibility.
- *
- * \param p_log ignored
- * \return always zero
- */
-LIBVLC_DEPRECATED LIBVLC_API
-unsigned libvlc_log_count( const libvlc_log_t *p_log );
-
-/**
- * This function does nothing.
- * It is only provided for backward compatibility.
- *
- * \param p_log ignored
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_clear( libvlc_log_t *p_log );
-
-/**
- * This function does nothing useful.
- * It is only provided for backward compatibility.
- *
- * \param p_log ignored
- * \return an unique pointer or NULL on error or if the parameter was NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log );
-
-/**
- * Frees memory allocated by libvlc_log_get_iterator().
- *
- * \param p_iter libvlc log iterator or NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
-
-/**
- * Always returns zero.
- * This function is only provided for backward compatibility.
- *
- * \param p_iter ignored
- * \return always zero
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter );
-
-/**
- * Always returns NULL.
- * This function is only provided for backward compatibility.
- *
- * \param p_iter libvlc log iterator or NULL
- * \param p_buf ignored
- * \return always NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
- libvlc_log_message_t *p_buf );
-
/** @} */
/**
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index e97241e..79873e8 100644
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -542,7 +542,7 @@ LIBVLC_API libvlc_media_t *libvlc_media_duplicate( libvlc_media_t *p_md );
* If the media has not yet been parsed this will return NULL.
*
* \see libvlc_media_parse
- * \see libvlc_media_parse_async
+ * \see libvlc_media_parse_with_options
* \see libvlc_MediaMetaChanged
*
* \param p_md the media descriptor
@@ -641,7 +641,7 @@ LIBVLC_API libvlc_time_t
* This fetches (local) art, meta data and tracks information.
* The method is synchronous.
*
- * \see libvlc_media_parse_async
+ * \see libvlc_media_parse_with_options
* \see libvlc_media_get_meta
* \see libvlc_media_get_tracks_info
*
@@ -651,34 +651,10 @@ LIBVLC_API void
libvlc_media_parse( libvlc_media_t *p_md );
/**
- * Parse a media.
- *
- * This fetches (local) art, meta data and tracks information.
- * The method is the asynchronous of libvlc_media_parse().
- *
- * To track when this is over you can listen to libvlc_MediaParsedChanged
- * event. However if the media was already parsed you will not receive this
- * event.
- *
- * \deprecated You can't be sure to receive the libvlc_MediaParsedChanged
- * event (you can wait indefinitely for this event).
- * Use libvlc_media_parse_with_options instead
- *
- * \see libvlc_media_parse
- * \see libvlc_MediaParsedChanged
- * \see libvlc_media_get_meta
- * \see libvlc_media_get_tracks_info
- *
- * \param p_md media descriptor object
- */
-LIBVLC_DEPRECATED LIBVLC_API void
-libvlc_media_parse_async( libvlc_media_t *p_md );
-
-/**
* Parse the media asynchronously with options.
*
* This fetches (local or network) art, meta data and/or tracks information.
- * This method is the extended version of libvlc_media_parse_async().
+ * This method is the extended version of libvlc_media_parse_with_options().
*
* To track when this is over you can listen to libvlc_MediaParsedStatus
* event. However if this functions returns an error, you will not receive any
@@ -704,22 +680,6 @@ libvlc_media_parse_with_options( libvlc_media_t *p_md,
libvlc_media_parse_flag_t parse_flag );
/**
- * Return true is the media descriptor object is parsed
- *
- * \deprecated This can return true in case of failure.
- * Use libvlc_media_get_parsed_status instead
- *
- * \see libvlc_MediaParsedChanged
- *
- * \param p_md media descriptor object
- * \return true if media object has been parsed otherwise it returns false
- *
- * \libvlc_return_bool
- */
-LIBVLC_DEPRECATED LIBVLC_API int
- libvlc_media_is_parsed( libvlc_media_t *p_md );
-
-/**
* Get Parsed status for media descriptor object.
*
* \see libvlc_MediaParsedStatus
@@ -759,25 +719,6 @@ LIBVLC_API void *libvlc_media_get_user_data( libvlc_media_t *p_md );
* before calling this function.
* Not doing this will result in an empty array.
*
- * \deprecated Use libvlc_media_tracks_get instead
- *
- * \param p_md media descriptor object
- * \param tracks address to store an allocated array of Elementary Streams
- * descriptions (must be freed by the caller) [OUT]
- *
- * \return the number of Elementary Streams
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_media_get_tracks_info( libvlc_media_t *p_md,
- libvlc_media_track_info_t **tracks );
-
-/**
- * Get media descriptor's elementary streams description
- *
- * Note, you need to call libvlc_media_parse() or play the media at least once
- * before calling this function.
- * Not doing this will result in an empty array.
- *
* \version LibVLC 2.1.0 and later.
*
* \param p_md media descriptor object
diff --git a/include/vlc/libvlc_media_discoverer.h b/include/vlc/libvlc_media_discoverer.h
index da0eb9d..47e53c0 100644
--- a/include/vlc/libvlc_media_discoverer.h
+++ b/include/vlc/libvlc_media_discoverer.h
@@ -70,13 +70,6 @@ typedef struct libvlc_media_discoverer_description {
typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t;
/**
- * \deprecated Use libvlc_media_discoverer_new() and libvlc_media_discoverer_start().
- */
-LIBVLC_DEPRECATED LIBVLC_API libvlc_media_discoverer_t *
-libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
- const char * psz_name );
-
-/**
* Create a media discoverer object by name.
*
* After this object is created, you should attach to events in order to be
diff --git a/include/vlc/libvlc_media_list.h b/include/vlc/libvlc_media_list.h
index dfb67a6..fa3b909 100644
--- a/include/vlc/libvlc_media_list.h
+++ b/include/vlc/libvlc_media_list.h
@@ -63,10 +63,6 @@ LIBVLC_API void
LIBVLC_API void
libvlc_media_list_retain( libvlc_media_list_t *p_ml );
-LIBVLC_DEPRECATED int
- libvlc_media_list_add_file_content( libvlc_media_list_t * p_ml,
- const char * psz_uri );
-
/**
* Associate media instance with this media list instance.
* If another media instance was present it will be released.
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 73562b8..456e99e 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -458,18 +458,6 @@ LIBVLC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi,
LIBVLC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *p_mi );
/**
- * \deprecated Use libvlc_media_player_set_nsobject instead
- */
-LIBVLC_DEPRECATED
-LIBVLC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable );
-
-/**
- * \deprecated Use libvlc_media_player_get_nsobject instead
- */
-LIBVLC_DEPRECATED
-LIBVLC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi );
-
-/**
* Set an X Window System drawable where the media player should render its
* video output. The call takes effect when the playback starts. If it is
* already started, it might need to be stopped before changes apply.
@@ -901,23 +889,6 @@ LIBVLC_API int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float
LIBVLC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi );
/**
- * Get movie fps rate
- *
- * This function is provided for backward compatibility. It cannot deal with
- * multiple video tracks. In LibVLC versions prior to 3.0, it would also fail
- * if the file format did not convey the frame rate explicitly.
- *
- * \deprecated Consider using libvlc_media_tracks_get() instead.
- *
- * \param p_mi the Media Player
- * \return frames per second (fps) for this playing movie, or 0 if unspecified
- */
-LIBVLC_DEPRECATED
-LIBVLC_API float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi );
-
-/** end bug */
-
-/**
* How many video outputs does this media player have?
*
* \param p_mi the media player
@@ -990,12 +961,6 @@ LIBVLC_API void libvlc_media_player_set_video_title_display( libvlc_media_player
*/
LIBVLC_API void libvlc_track_description_list_release( libvlc_track_description_t *p_track_description );
-/**
- * \deprecated Use libvlc_track_description_list_release instead
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
-
/** \defgroup libvlc_video LibVLC video controls
* @{
*/
@@ -1082,26 +1047,6 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
unsigned *px, unsigned *py );
/**
- * Get current video height.
- * \deprecated Use libvlc_video_get_size() instead.
- *
- * \param p_mi the media player
- * \return the video pixel height or 0 if not applicable
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_video_get_height( libvlc_media_player_t *p_mi );
-
-/**
- * Get current video width.
- * \deprecated Use libvlc_video_get_size() instead.
- *
- * \param p_mi the media player
- * \return the video pixel width or 0 if not applicable
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_video_get_width( libvlc_media_player_t *p_mi );
-
-/**
* Get the mouse pointer coordinates over a video.
* Coordinates are expressed in terms of the decoded video resolution,
* <b>not</b> in terms of pixels on the screen/viewport (to get the latter,
@@ -1237,16 +1182,6 @@ LIBVLC_API int64_t libvlc_video_get_spu_delay( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_set_spu_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
/**
- * Get the description of available titles.
- *
- * \param p_mi the media player
- * \return list containing description of available titles.
- * It must be freed with libvlc_track_description_list_release()
- */
-LIBVLC_DEPRECATED LIBVLC_API libvlc_track_description_t *
- libvlc_video_get_title_description( libvlc_media_player_t *p_mi );
-
-/**
* Get the full description of available titles
*
* \version LibVLC 3.0.0 and later.
@@ -1303,17 +1238,6 @@ void libvlc_chapter_descriptions_release( libvlc_chapter_description_t **p_chapt
unsigned i_count );
/**
- * Get the description of available chapters for specific title.
- *
- * \param p_mi the media player
- * \param i_title selected title
- * \return list containing description of available chapter for title i_title.
- * It must be freed with libvlc_track_description_list_release()
- */
-LIBVLC_DEPRECATED LIBVLC_API libvlc_track_description_t *
- libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi, int i_title );
-
-/**
* Get current crop filter geometry.
*
* \param p_mi the media player
@@ -1626,31 +1550,6 @@ LIBVLC_API int libvlc_audio_output_set( libvlc_media_player_t *p_mi,
const char *psz_name );
/**
- * Backward compatibility stub. Do not use in new code.
- * Use libvlc_audio_output_device_list_get() instead.
- * \return always 0.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_audio_output_device_count( libvlc_instance_t *, const char * );
-
-/**
- * Backward compatibility stub. Do not use in new code.
- * Use libvlc_audio_output_device_list_get() instead.
- * \return always NULL.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-char *libvlc_audio_output_device_longname( libvlc_instance_t *, const char *,
- int );
-
-/**
- * Backward compatibility stub. Do not use in new code.
- * Use libvlc_audio_output_device_list_get() instead.
- * \return always NULL.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-char *libvlc_audio_output_device_id( libvlc_instance_t *, const char *, int );
-
-/**
* Gets a list of potential audio output devices,
* \see libvlc_audio_output_device_set().
*
@@ -1771,21 +1670,6 @@ LIBVLC_API void libvlc_audio_output_device_set( libvlc_media_player_t *mp,
LIBVLC_API char *libvlc_audio_output_device_get( libvlc_media_player_t *mp );
/**
- * Stub for backward compatibility.
- * \return always -1.
- */
-LIBVLC_DEPRECATED
-LIBVLC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
-
-/**
- * Stub for backward compatibility.
- */
-LIBVLC_DEPRECATED
-LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *,
- int );
-
-
-/**
* Toggle mute status.
*
* \param p_mi media player
diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index 54cd1fd..c7b0680 100644
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -48,7 +48,7 @@ typedef int64_t libvlc_time_t;
/**@} */
/**
- * \ingroup libvlc_log
+ * \ingroup libvlc_core libvlc_log_deprecated
* @{
*/
diff --git a/lib/core.c b/lib/core.c
index fa5c4de..c5ff949 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -27,7 +27,7 @@
#include "libvlc_internal.h"
#include <vlc_modules.h>
-#include <vlc/libvlc.h>
+#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <vlc_vlm.h>
diff --git a/lib/log.c b/lib/log.c
index bd774b9..f3a769a 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -27,7 +27,7 @@
#endif
#include <assert.h>
-#include <vlc/libvlc.h>
+#include <vlc/vlc.h>
#include "libvlc_internal.h"
#include <vlc_common.h>
#include <vlc_interface.h>
diff --git a/lib/media_library.c b/lib/media_library.c
index 8b69165..9e84654 100644
--- a/lib/media_library.c
+++ b/lib/media_library.c
@@ -26,11 +26,7 @@
# include "config.h"
#endif
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-#include <vlc/libvlc_media_list.h>
-#include <vlc/libvlc_media_library.h>
-#include <vlc/libvlc_events.h>
+#include <vlc/vlc.h>
#include <vlc_common.h>
diff --git a/lib/playlist.c b/lib/playlist.c
index c0e610f..2aa6e1c 100644
--- a/lib/playlist.c
+++ b/lib/playlist.c
@@ -28,11 +28,7 @@
#include "libvlc_internal.h"
#include "../src/libvlc.h"
-#include <vlc/libvlc_structures.h>
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-#include <vlc/libvlc_media_player.h>
-#include <vlc/deprecated.h>
+#include <vlc/vlc.h>
#include <vlc_playlist.h>
--
2.8.0.rc3
More information about the vlc-devel
mailing list