X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc%2Flibvlc_structures.h;h=1f830d7e23c94115d5eb50842a2afb7d4f67e3ee;hb=b69b0bd6e6912b338bb991d97b92ea9acb29c656;hp=49ddbbbb1924dc15a371c96ae8ab453b37bf6685;hpb=2c7d795fd2344675fa0d3cf4b9c79a7fdfba1879;p=vlc diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h index 49ddbbbb19..1f830d7e23 100644 --- a/include/vlc/libvlc_structures.h +++ b/include/vlc/libvlc_structures.h @@ -79,115 +79,10 @@ typedef int64_t libvlc_time_t; * @{ */ -/* Meta Handling */ -/** defgroup libvlc_meta libvlc_meta - * \ingroup libvlc_media - * LibVLC Media Meta - * @{ - */ - -typedef enum libvlc_meta_t { - libvlc_meta_Title, - libvlc_meta_Artist, - libvlc_meta_Genre, - libvlc_meta_Copyright, - libvlc_meta_Album, - libvlc_meta_TrackNumber, - libvlc_meta_Description, - libvlc_meta_Rating, - libvlc_meta_Date, - libvlc_meta_Setting, - libvlc_meta_URL, - libvlc_meta_Language, - libvlc_meta_NowPlaying, - libvlc_meta_Publisher, - libvlc_meta_EncodedBy, - libvlc_meta_ArtworkURL, - libvlc_meta_TrackID, - /* Add new meta types HERE */ -} libvlc_meta_t; - -/**@} */ - -typedef struct libvlc_media_t libvlc_media_t; /**@} */ -/***************************************************************************** - * Media Instance - *****************************************************************************/ -/** \defgroup libvlc_media_player libvlc_media_player - * \ingroup libvlc - * LibVLC Media Instance handling - * @{ - */ - -typedef struct libvlc_media_player_t libvlc_media_player_t; - -/** - * Note the order of libvlc_state_t enum must match exactly the order of - * @see mediacontrol_PlayerStatus and @see input_state_e enums. - * - * Expected states by web plugins are: - * IDLE/CLOSE=0, OPENING=1, BUFFERING=2, PLAYING=3, PAUSED=4, - * STOPPING=5, ENDED=6, ERROR=7 - */ -typedef enum libvlc_state_t -{ - libvlc_NothingSpecial=0, - libvlc_Opening, - libvlc_Buffering, - libvlc_Playing, - libvlc_Paused, - libvlc_Stopped, - libvlc_Ended, - libvlc_Error -} libvlc_state_t; - -/**@} */ - -/***************************************************************************** - * Media List - *****************************************************************************/ -/** \defgroup libvlc_media_list libvlc_media_list - * \ingroup libvlc - * LibVLC Media List handling - * @{ - */ - -typedef struct libvlc_media_list_t libvlc_media_list_t; -typedef struct libvlc_media_list_view_t libvlc_media_list_view_t; - - -/***************************************************************************** - * Media List Player - *****************************************************************************/ -/** \defgroup libvlc_media_list_player libvlc_media_list_player - * \ingroup libvlc_media_list - * LibVLC Media List Player handling - * @{ - */ - -typedef struct libvlc_media_list_player_t libvlc_media_list_player_t; - -/**@} libvlc_media_list_player */ - -/**@} libvlc_media_list */ - -/***************************************************************************** - * Media Library - *****************************************************************************/ -/** \defgroup libvlc_media_library libvlc_media_library - * \ingroup libvlc - * LibVLC Media Library - * @{ - */ - -typedef struct libvlc_media_library_t libvlc_media_library_t; - -/**@} */ - /***************************************************************************** * Playlist *****************************************************************************/ @@ -208,96 +103,6 @@ typedef struct libvlc_playlist_item_t /**@} */ -/***************************************************************************** - * Media Player - *****************************************************************************/ -/** \defgroup libvlc_media_player libvlc_media_player - * \ingroup libvlc - * LibVLC Media Player, object that let you play a media - * in a libvlc_drawable_t - * @{ - */ - -/** - * Description for video, audio tracks and subtitles. It contains - * id, name (description string) and pointer to next record. - */ -typedef struct libvlc_track_description_t -{ - int i_id; - char *psz_name; - struct libvlc_track_description_t *p_next; - -} libvlc_track_description_t; - -/**@} */ - -/***************************************************************************** - * Audio - *****************************************************************************/ -/** \defgroup libvlc_audio libvlc_audio - * \ingroup libvlc_media_player - * LibVLC Audio handling - * @{ - */ - -/** - * Description for audio output. It contains - * name, description and pointer to next record. - */ -typedef struct libvlc_audio_output_t -{ - char *psz_name; - char *psz_description; - struct libvlc_audio_output_t *p_next; - -} libvlc_audio_output_t; - -/**@} */ - - -/***************************************************************************** - * Video - *****************************************************************************/ -/** \defgroup libvlc_video libvlc_video - * \ingroup libvlc_media_player - * LibVLC Video handling - * @{ - */ - -/** -* Downcast to this general type as placeholder for a platform specific one, such as: -* Drawable on X11, -* CGrafPort on MacOSX, -* HWND on win32 -*/ -typedef int libvlc_drawable_t; - -/** -* Rectangle type for video geometry -*/ -typedef struct libvlc_rectangle_t -{ - int top, left; - int bottom, right; -} -libvlc_rectangle_t; - -/**@} */ - - -/***************************************************************************** - * Services/Media Discovery - *****************************************************************************/ -/** \defgroup libvlc_media_discoverer libvlc_media_discoverer - * \ingroup libvlc - * LibVLC Media Discoverer - * @{ - */ - -typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t; - -/**@} */ /***************************************************************************** * Message log handling