X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc%2Flibvlc_structures.h;h=b76f2df6ab34b77fa1196f627aab68b6905bc17c;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=96fa3a6afddee0afeffd08ee546525dfdb484c82;hpb=d98eefb8e446b8fd52c11b3029e980cb71ccc9c4;p=vlc diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h index 96fa3a6afd..b76f2df6ab 100644 --- a/include/vlc/libvlc_structures.h +++ b/include/vlc/libvlc_structures.h @@ -1,7 +1,7 @@ /***************************************************************************** * libvlc.h: libvlc_* new external API structures ***************************************************************************** - * Copyright (C) 1998-2007 the VideoLAN team + * Copyright (C) 1998-2008 the VideoLAN team * $Id $ * * Authors: Filippo Carone @@ -21,216 +21,34 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _LIBVLC_STRUCTURES_H -#define _LIBVLC_STRUCTURES_H 1 +#ifndef LIBVLC_STRUCTURES_H +#define LIBVLC_STRUCTURES_H 1 -#include +/** + * \file + * This file defines libvlc_* new external API structures + */ + +#include # ifdef __cplusplus extern "C" { # endif -/** This structure is opaque. It represents a libvlc instance */ -typedef struct libvlc_instance_t libvlc_instance_t; - -/***************************************************************************** - * Exceptions - *****************************************************************************/ - -/** defgroup libvlc_exception Exceptions - * \ingroup libvlc - * LibVLC Exceptions handling - * @{ - */ - -typedef struct libvlc_exception_t -{ - int b_raised; - int i_code; - char *psz_message; -} libvlc_exception_t; - -/**@} */ - -/***************************************************************************** - * Tag - *****************************************************************************/ -/** defgroup libvlc_tag Tag - * \ingroup libvlc - * LibVLC Tag support in media descriptor - * @{ - */ - -typedef struct libvlc_tag_query_t libvlc_tag_query_t; -typedef char * libvlc_tag_t; - -/**@} */ - -/***************************************************************************** - * Media Descriptor - *****************************************************************************/ -/** defgroup libvlc_media_descriptor MediaDescriptor - * \ingroup libvlc - * LibVLC Media Descriptor handling - * @{ - */ - -/* Meta Handling */ -/** defgroup libvlc_meta Meta - * \ingroup libvlc_media_descriptor - * 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 -} libvlc_meta_t; - -/**@} */ - -typedef struct libvlc_media_descriptor_t libvlc_media_descriptor_t; - -/**@} */ - - -/***************************************************************************** - * Media Instance - *****************************************************************************/ -/** defgroup libvlc_media_instance MediaInstance - * \ingroup libvlc - * LibVLC Media Instance handling - * @{ - */ - -typedef struct libvlc_media_instance_t libvlc_media_instance_t; - -/**@} */ - -/***************************************************************************** - * Media List - *****************************************************************************/ -/** defgroup libvlc_media_list MediaList - * \ingroup libvlc - * LibVLC Media List handling - * @{ - */ - -typedef struct libvlc_media_list_t libvlc_media_list_t; - -/**@} */ - -/***************************************************************************** - * Media List Player - *****************************************************************************/ -/** defgroup libvlc_media_list_player MediaListPlayer - * \ingroup libvlc - * LibVLC Media List Player handling - * @{ - */ - -typedef struct libvlc_media_list_player_t libvlc_media_list_player_t; - -/**@} */ - -/***************************************************************************** - * Media Library - *****************************************************************************/ -/** defgroup libvlc_media_library Media Library - * \ingroup libvlc - * LibVLC Media Library - * @{ - */ - -typedef struct libvlc_media_library_t libvlc_media_library_t; - -/**@} */ - -/***************************************************************************** - * Playlist - *****************************************************************************/ -/** defgroup libvlc_playlist Playlist - * \ingroup libvlc - * LibVLC Playlist handling +/** + * \ingroup libvlc_core * @{ */ -typedef struct libvlc_playlist_item_t -{ - int i_id; - char * psz_uri; - char * psz_name; +/** This structure is opaque. It represents a libvlc instance */ +typedef struct libvlc_instance_t libvlc_instance_t; -} libvlc_playlist_item_t; +typedef int64_t libvlc_time_t; /**@} */ - -/***************************************************************************** - * Video - *****************************************************************************/ -/** defgroup libvlc_video Video - * \ingroup libvlc - * 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 Media Discoverer - * \ingroup libvlc - * LibVLC Media Discoverer - * @{ - */ - -typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t; - -/**@} */ - -/***************************************************************************** - * Message log handling - *****************************************************************************/ - -/** defgroup libvlc_log Log - * \ingroup libvlc - * LibVLC Message Logging + * \ingroup libvlc_log * @{ */ @@ -252,91 +70,6 @@ typedef struct libvlc_log_message_t /**@} */ -/***************************************************************************** - * Callbacks handling - *****************************************************************************/ - -/** defgroup libvlc_callbacks Callbacks - * \ingroup libvlc - * LibVLC Event Callbacks - * @{ - */ - -/** - * Available events: (XXX: being reworked) - * - libvlc_MediaInstanceReachedEnd - */ - -typedef enum libvlc_event_type_t { - libvlc_MediaDescriptorMetaChanged, - libvlc_MediaDescriptorSubItemAdded, - - libvlc_MediaInstanceReachedEnd, - - libvlc_MediaListItemAdded, - libvlc_MediaListItemDeleted, - libvlc_MediaListItemChanged, - -} libvlc_event_type_t; - -/** - * An Event - * \param type the even type - * \param p_obj the sender object - * \param u Event dependent content - */ - -typedef struct libvlc_event_t -{ - libvlc_event_type_t type; - void * p_obj; - union event_type_specific - { - /* media descriptor */ - struct - { - libvlc_meta_t meta_type; - } media_descriptor_meta_changed; - struct - { - libvlc_media_descriptor_t * new_child; - } media_descriptor_subitem_added; - - /* media list */ - struct - { - libvlc_media_descriptor_t * item; - int index; - } media_list_item_added; - struct - { - libvlc_media_descriptor_t * item; - int index; - } media_list_item_deleted; - struct - { - libvlc_media_descriptor_t * item; - int index; - } media_list_item_changed; - } u; -} libvlc_event_t; - -/** - * Event manager that belongs to a libvlc object, and from whom events can - * be received. - */ - -typedef struct libvlc_event_manager_t libvlc_event_manager_t; - -/** - * Callback function notification - * \param p_event the event triggering the callback - */ - -typedef void ( *libvlc_callback_t )( const libvlc_event_t *, void * ); - -/**@} */ - # ifdef __cplusplus } # endif