X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc%2Fdeprecated.h;h=97cb97a8818c90be092cd88b8780155d26edd477;hb=3a8c75ab428baab370c73d2b2be82159267c7cb3;hp=886dfdbded7f45890e855f5bc4f14c412c425068;hpb=1c5d76c2e9f518825a0016344d4f0fef9e8247b6;p=vlc diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h index 886dfdbded..97cb97a881 100644 --- a/include/vlc/deprecated.h +++ b/include/vlc/deprecated.h @@ -41,76 +41,6 @@ typedef int libvlc_drawable_t; extern "C" { # endif -/** - * Set the drawable where the media player should render its video output. - * - * On Windows 32-bits, a window handle (HWND) is expected. - * On Windows 64-bits, this function will always fail. - * - * On OSX 32-bits, a CGrafPort is expected. - * On OSX 64-bits, this function will always fail. - * - * On other platforms, an existing X11 window ID is expected. See - * libvlc_media_player_set_xid() for details. - * - * \param p_mi the Media Player - * \param drawable the libvlc_drawable_t where the media player - * should render its video - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_media_player_set_drawable ( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * ); - -/** - * Get the drawable where the media player should render its video output - * - * \param p_mi the Media Player - * \param p_e an initialized exception pointer - * \return the libvlc_drawable_t where the media player - * should render its video - */ -VLC_DEPRECATED_API libvlc_drawable_t - libvlc_media_player_get_drawable ( libvlc_media_player_t *, libvlc_exception_t * ); - -/** - * Set the default video output's parent. - * - * This setting will be used as default for any video output. - * - * \param p_instance libvlc instance - * \param drawable the new parent window - * (see libvlc_media_player_set_drawable() for details) - * \param p_e an initialized exception pointer - * @deprecated Use libvlc_media_player_set_drawable - */ -VLC_DEPRECATED_API void libvlc_video_set_parent( libvlc_instance_t *, libvlc_drawable_t, libvlc_exception_t * ); - -/** - * Set the default video output parent. - * - * This setting will be used as default for all video outputs. - * - * \param p_instance libvlc instance - * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32) - * \param p_e an initialized exception pointer - * @deprecated Use libvlc_media_player_get_drawable - */ -VLC_DEPRECATED_API libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *, libvlc_exception_t * ); - -/** - * Change the parent for the current the video output. - * - * \param p_instance libvlc instance - * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32) - * \param p_e an initialized exception pointer - * \return the success status (boolean) - */ -VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * ); - -/* - * This function shall not be used at all. It may lead to crash and race condition. - */ -VLC_DEPRECATED_API int libvlc_video_destroy( libvlc_media_player_t *, libvlc_exception_t *); - /***************************************************************************** * Playlist (Deprecated) *****************************************************************************/ @@ -122,18 +52,7 @@ VLC_DEPRECATED_API int libvlc_video_destroy( libvlc_media_player_t *, libvlc_exc */ /** - * Set the playlist's loop attribute. If set, the playlist runs continuously - * and wraps around when it reaches the end. - * - * \param p_instance the playlist instance - * \param loop the loop attribute. 1 sets looping, 0 disables it - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_loop( libvlc_instance_t* , int, - libvlc_exception_t * ); - -/** - * Start playing. + * Start playing (if there is any item in the playlist). * * Additionnal playlist item options can be specified for addition to the * item before it is played. @@ -144,162 +63,9 @@ VLC_DEPRECATED_API void libvlc_playlist_loop( libvlc_instance_t* , int, * played * \param i_options the number of options to add to the item * \param ppsz_options the options to add to the item - * \param p_e an initialized exception pointer */ VLC_DEPRECATED_API void libvlc_playlist_play( libvlc_instance_t*, int, int, - char **, libvlc_exception_t * ); - -/** - * Toggle the playlist's pause status. - * - * If the playlist was running, it is paused. If it was paused, it is resumed. - * - * \param p_instance the playlist instance to pause - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_pause( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Checks whether the playlist is running - * - * \param p_instance the playlist instance - * \param p_e an initialized exception pointer - * \return 0 if the playlist is stopped or paused, 1 if it is running - */ -VLC_DEPRECATED_API int libvlc_playlist_isplaying( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Get the number of items in the playlist - * - * Expects the playlist instance to be locked already. - * - * \param p_instance the playlist instance - * \param p_e an initialized exception pointer - * \return the number of items - */ -VLC_DEPRECATED_API int libvlc_playlist_items_count( libvlc_instance_t *, - libvlc_exception_t * ); - -VLC_DEPRECATED_API int libvlc_playlist_get_current_index( libvlc_instance_t *, - libvlc_exception_t *); -/** - * Lock the playlist. - * - * \param p_instance the playlist instance - */ -VLC_DEPRECATED_API void libvlc_playlist_lock( libvlc_instance_t * ); - -/** - * Unlock the playlist. - * - * \param p_instance the playlist instance - */ -VLC_DEPRECATED_API void libvlc_playlist_unlock( libvlc_instance_t * ); - -/** - * Stop playing. - * - * \param p_instance the playlist instance to stop - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_stop( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Go to the next playlist item. If the playlist was stopped, playback - * is started. - * - * \param p_instance the playlist instance - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_next( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Go to the previous playlist item. If the playlist was stopped, playback - * is started. - * - * \param p_instance the playlist instance - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_prev( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Empty a playlist. All items in the playlist are removed. - * - * \param p_instance the playlist instance - * \param p_e an initialized exception pointer - */ -VLC_DEPRECATED_API void libvlc_playlist_clear( libvlc_instance_t *, - libvlc_exception_t * ); - -/** - * Append an item to the playlist. The item is added at the end. If more - * advanced options are required, \see libvlc_playlist_add_extended instead. - * - * \param p_instance the playlist instance - * \param psz_uri the URI to open, using VLC format - * \param psz_name a name that you might want to give or NULL - * \param p_e an initialized exception pointer - * \return the identifier of the new item - */ -VLC_DEPRECATED_API int libvlc_playlist_add( libvlc_instance_t *, const char *, - const char *, libvlc_exception_t * ); - -/** - * Append an item to the playlist. The item is added at the end, with - * additional input options. - * - * \param p_instance the playlist instance - * \param psz_uri the URI to open, using VLC format - * \param psz_name a name that you might want to give or NULL - * \param i_options the number of options to add - * \param ppsz_options strings representing the options to add - * \param p_e an initialized exception pointer - * \return the identifier of the new item - */ -VLC_DEPRECATED_API int libvlc_playlist_add_extended( libvlc_instance_t *, const char *, - const char *, int, const char **, - libvlc_exception_t * ); - -/** - * Append an item to the playlist. The item is added at the end, with - * additional input options from an untrusted source. - * - * \param p_instance the playlist instance - * \param psz_uri the URI to open, using VLC format - * \param psz_name a name that you might want to give or NULL - * \param i_options the number of options to add - * \param ppsz_options strings representing the options to add - * \param p_e an initialized exception pointer - * \return the identifier of the new item - */ -VLC_DEPRECATED_API int libvlc_playlist_add_extended_untrusted( libvlc_instance_t *, const char *, - const char *, int, const char **, - libvlc_exception_t * ); - -/** - * Delete the playlist item with the given ID. - * - * \param p_instance the playlist instance - * \param i_id the id to remove - * \param p_e an initialized exception pointer - * \return 0 in case of success, a non-zero value otherwise - */ -VLC_DEPRECATED_API int libvlc_playlist_delete_item( libvlc_instance_t *, int, - libvlc_exception_t * ); - -/** Get the input that is currently being played by the playlist. - * - * \param p_instance the playlist instance to use - * \param p_e an initialized exception pointern - * \return a media instance object - */ -VLC_DEPRECATED_API libvlc_media_player_t * libvlc_playlist_get_media_player( - libvlc_instance_t *, libvlc_exception_t * ); + char ** ); /** @}*/