diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h index fdda1e21be..735a898771 100644 --- a/include/vlc/deprecated.h +++ b/include/vlc/deprecated.h @@ -29,8 +29,372 @@ 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) + * @{ + */ + +/** This structure is opaque. It represents a libvlc log iterator */ +typedef struct libvlc_log_iterator_t libvlc_log_iterator_t; + +typedef struct libvlc_log_message_t +{ + int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */ + const char *psz_type; /* module type */ + const char *psz_name; /* module name */ + const char *psz_header; /* optional header */ + const char *psz_message; /* message */ +} libvlc_log_message_t; + +/** + * 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 68023ef9eb..e2305ea382 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -212,17 +212,6 @@ LIBVLC_API 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 e97241ef9a..79873e84af 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 * @@ -650,35 +650,11 @@ LIBVLC_API libvlc_time_t 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 @@ -703,22 +679,6 @@ LIBVLC_API int 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. * @@ -752,25 +712,6 @@ LIBVLC_API void */ LIBVLC_API void *libvlc_media_get_user_data( 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 ); - /** * Get media descriptor's elementary streams description * diff --git a/include/vlc/libvlc_media_discoverer.h b/include/vlc/libvlc_media_discoverer.h index da0eb9d7ed..47e53c0c50 100644 --- a/include/vlc/libvlc_media_discoverer.h +++ b/include/vlc/libvlc_media_discoverer.h @@ -69,13 +69,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. * diff --git a/include/vlc/libvlc_media_list.h b/include/vlc/libvlc_media_list.h index dfb67a6173..fa3b90932b 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 73562b84e1..456e99e17d 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -457,18 +457,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 @@ -900,23 +888,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? * @@ -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 * @{ */ @@ -1081,26 +1046,6 @@ LIBVLC_API 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, @@ -1236,16 +1181,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 * @@ -1302,17 +1237,6 @@ LIBVLC_API void libvlc_chapter_descriptions_release( libvlc_chapter_description_t **p_chapters, 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. * @@ -1625,31 +1549,6 @@ void libvlc_audio_output_list_release( libvlc_audio_output_t *p_list ); 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(). @@ -1770,21 +1669,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. * diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h index 54cd1fd300..d7ad4a584b 100644 --- a/include/vlc/libvlc_structures.h +++ b/include/vlc/libvlc_structures.h @@ -47,25 +47,6 @@ typedef int64_t libvlc_time_t; /**@} */ -/** - * \ingroup libvlc_log - * @{ - */ - -/** This structure is opaque. It represents a libvlc log iterator */ -typedef struct libvlc_log_iterator_t libvlc_log_iterator_t; - -typedef struct libvlc_log_message_t -{ - int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */ - const char *psz_type; /* module type */ - const char *psz_name; /* module name */ - const char *psz_header; /* optional header */ - const char *psz_message; /* message */ -} libvlc_log_message_t; - -/**@} */ - # ifdef __cplusplus } # endif diff --git a/lib/core.c b/lib/core.c index fa5c4de6d0..c5ff949691 100644 --- a/lib/core.c +++ b/lib/core.c @@ -27,7 +27,7 @@ #include "libvlc_internal.h" #include -#include +#include #include #include diff --git a/lib/log.c b/lib/log.c index bd774b96f1..f3a769a9ba 100644 --- a/lib/log.c +++ b/lib/log.c @@ -27,7 +27,7 @@ #endif #include -#include +#include #include "libvlc_internal.h" #include #include diff --git a/lib/media_library.c b/lib/media_library.c index 8b691656eb..9e8465441e 100644 --- a/lib/media_library.c +++ b/lib/media_library.c @@ -26,11 +26,7 @@ # include "config.h" #endif -#include -#include -#include -#include -#include +#include #include diff --git a/lib/playlist.c b/lib/playlist.c index c0e610fa52..2aa6e1c705 100644 --- a/lib/playlist.c +++ b/lib/playlist.c @@ -28,11 +28,7 @@ #include "libvlc_internal.h" #include "../src/libvlc.h" -#include -#include -#include -#include -#include +#include #include