Commit dc09f863 authored by Clément Stenac's avatar Clément Stenac

Remove unused structures from vlc_common.h

Minor headers cleanup
parent bf50e13b
......@@ -63,7 +63,7 @@ struct libvlc_t
/* Arch-specific variables */
#if !defined( WIN32 )
vlc_bool_t b_daemon;
#endif
#endif
#if defined( SYS_BEOS )
vlc_object_t * p_appthread;
char * psz_vlcpath;
......@@ -117,7 +117,7 @@ struct vlc_t
const char *psz_action;
int i_action;
int i_key;
/* hotkey accounting information */
mtime_t i_delta_date;/*< minimum delta time between two key presses */
mtime_t i_last_date; /*< last date key was pressed */
......
......@@ -17,7 +17,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......
......@@ -89,7 +89,7 @@ typedef struct
char *psz_path;
char *psz_option;
char *psz_buffer; /* to be freed */
} vlc_url_t;
......@@ -114,7 +114,7 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
url->i_port = 0;
url->psz_path = NULL;
url->psz_option = NULL;
if( psz_url == NULL )
{
url->psz_buffer = NULL;
......@@ -235,7 +235,7 @@ static inline int isurlsafe( int c )
}
/*****************************************************************************
* vlc_UrlEncode:
* vlc_UrlEncode:
*****************************************************************************
* perform URL encoding
* (you do NOT want to do URL decoding - it is not reversible - do NOT do it)
......@@ -305,7 +305,8 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
*****************************************************************************/
static inline char *vlc_b64_encode( char *src )
{
static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
size_t len = strlen( src );
char *ret;
......@@ -530,7 +531,7 @@ static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const c
psz_addr, vlc_gai_strerror( i ) );
return VLC_FALSE;
}
if( res->ai_family == AF_INET )
{
#if !defined( SYS_BEOS )
......@@ -546,7 +547,7 @@ static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const c
b_multicast = IN6_IS_ADDR_MULTICAST( &v6->sin6_addr );
}
#endif
vlc_freeaddrinfo( res );
return b_multicast;
}
......
......@@ -209,7 +209,7 @@ struct sout_stream_t
/* Subpicture unit */
spu_t *p_spu;
/* add, remove a stream */
sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * );
int (*pf_del)( sout_stream_t *, sout_stream_id_t * );
......
/*****************************************************************************
* vlc_access.h
* vlc_access.h: Access descriptor, queries and methods
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* $Id$
......@@ -104,7 +104,7 @@ struct access_t
int i_title; /* idem, start from 0 (could be menu) */
int i_seekpoint;/* idem, start from 0 */
vlc_bool_t b_prebuffered; /* Read only for input */
vlc_bool_t b_prebuffered; /* Read only for input */
} info;
access_sys_t *p_sys;
};
......
......@@ -2,6 +2,7 @@
* vlc_acl.h: interface to the network Access Control List internal API
*****************************************************************************
* Copyright (C) 2005 Rémi Denis-Courmont
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Rémi Denis-Courmont <rem # videolan.org>
......
/*****************************************************************************
* bits.h :
* bits.h : Bit handling helpers
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* $Id$
......
......@@ -250,7 +250,6 @@ typedef struct intf_thread_t intf_thread_t;
typedef struct intf_sys_t intf_sys_t;
typedef struct intf_console_t intf_console_t;
typedef struct intf_msg_t intf_msg_t;
typedef struct intf_channel_t intf_channel_t;
typedef struct interaction_t interaction_t;
typedef struct interaction_dialog_t interaction_dialog_t;
typedef struct user_widget_t user_widget_t;
......@@ -259,16 +258,16 @@ typedef struct user_widget_t user_widget_t;
typedef struct input_thread_t input_thread_t;
typedef struct input_thread_sys_t input_thread_sys_t;
typedef struct input_item_t input_item_t;
typedef struct input_area_t input_area_t;
typedef struct input_buffers_t input_buffers_t;
typedef struct input_socket_t input_socket_t;
typedef struct access_t access_t;
typedef struct access_sys_t access_sys_t;
typedef struct stream_t stream_t;
typedef struct stream_sys_t stream_sys_t;
typedef struct demux_t demux_t;
typedef struct demux_sys_t demux_sys_t;
typedef struct es_out_t es_out_t;
typedef struct es_out_id_t es_out_id_t;
typedef struct es_out_sys_t es_out_sys_t;
typedef struct es_descriptor_t es_descriptor_t;
typedef struct es_sys_t es_sys_t;
typedef struct pgrm_descriptor_t pgrm_descriptor_t;
typedef struct pgrm_sys_t pgrm_sys_t;
typedef struct stream_descriptor_t stream_descriptor_t;
typedef struct seekpoint_t seekpoint_t;
typedef struct info_t info_t;
typedef struct info_category_t info_category_t;
......@@ -280,15 +279,6 @@ typedef struct subs_format_t subs_format_t;
typedef struct es_format_t es_format_t;
typedef struct video_palette_t video_palette_t;
/* NInput */
typedef struct stream_sys_t stream_sys_t;
typedef struct stream_t stream_t;
typedef struct es_out_t es_out_t;
typedef struct es_out_id_t es_out_id_t;
typedef struct es_out_sys_t es_out_sys_t;
typedef struct demux_t demux_t;
typedef struct access_t access_t;
/* Audio */
typedef struct aout_instance_t aout_instance_t;
typedef struct aout_sys_t aout_sys_t;
......@@ -310,6 +300,7 @@ typedef struct picture_t picture_t;
typedef struct picture_sys_t picture_sys_t;
typedef struct picture_heap_t picture_heap_t;
/* Subpictures */
typedef struct spu_t spu_t;
typedef struct subpicture_t subpicture_t;
typedef struct subpicture_sys_t subpicture_sys_t;
......@@ -341,7 +332,6 @@ typedef struct session_descriptor_t session_descriptor_t;
typedef struct announce_method_t announce_method_t;
typedef struct announce_handler_t announce_handler_t;
typedef struct sap_handler_t sap_handler_t;
/* typedef struct slp_session_t slp_session_t; */
/* Decoders */
typedef struct decoder_t decoder_t;
......@@ -355,18 +345,16 @@ typedef struct encoder_sys_t encoder_sys_t;
typedef struct filter_t filter_t;
typedef struct filter_sys_t filter_sys_t;
/* Misc */
typedef struct data_packet_t data_packet_t;
typedef struct data_buffer_t data_buffer_t;
typedef struct stream_ctrl_t stream_ctrl_t;
typedef struct pes_packet_t pes_packet_t;
/* Network */
typedef struct network_socket_t network_socket_t;
typedef struct virtual_socket_t v_socket_t;
typedef struct iso639_lang_t iso639_lang_t;
typedef struct sockaddr sockaddr;
typedef struct addrinfo addrinfo;
typedef struct vlc_acl_t vlc_acl_t;
/* Misc */
typedef struct iso639_lang_t iso639_lang_t;
/* block */
typedef struct block_t block_t;
typedef struct block_fifo_t block_fifo_t;
......
/*****************************************************************************
* vlc_demux.h
* vlc_demux.h: Demuxer descriptor, queries and methods
*****************************************************************************
* Copyright (C) 1999-2005 VideoLAN (Centrale Réseaux) and its contributors
* Copyright (C) 1999-2005 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......
/*****************************************************************************
* vlc_es_out.h
* vlc_es_out.h: es_out (demuxer output) descriptor, queries and methods
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* $Id$
......
......@@ -32,19 +32,20 @@ extern "C" {
struct image_handler_t
{
picture_t * (*pf_read) ( image_handler_t *, block_t *,
video_format_t *, video_format_t * );
picture_t * (*pf_read_url) ( image_handler_t *, const char *,
video_format_t *, video_format_t * );
block_t * (*pf_write) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t * );
int (*pf_write_url) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t *, const char * );
picture_t * (*pf_read) ( image_handler_t *, block_t *,
video_format_t *, video_format_t * );
picture_t * (*pf_read_url) ( image_handler_t *, const char *,
video_format_t *, video_format_t * );
block_t * (*pf_write) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t * );
int (*pf_write_url) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t *,
const char * );
picture_t * (*pf_convert) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t * );
picture_t * (*pf_filter) ( image_handler_t *, picture_t *,
video_format_t *, const char * );
picture_t * (*pf_convert) ( image_handler_t *, picture_t *,
video_format_t *, video_format_t * );
picture_t * (*pf_filter) ( image_handler_t *, picture_t *,
video_format_t *, const char * );
/* Private properties */
vlc_object_t *p_parent;
......
/*****************************************************************************
* vlc_input.h:
* vlc_input.h: Core input structures
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* $Id$
......
/*****************************************************************************
* vlc_meta.h
* vlc_meta.h: Stream meta-data
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* $Id$
......@@ -39,11 +39,11 @@
#define VLC_META_NOW_PLAYING N_("Now Playing")
#define VLC_META_CDDB_ARTIST N_("CDDB Artist")
#define VLC_META_CDDB_CATEGORY N_("CDDB Category")
#define VLC_META_CDDB_CATEGORY N_("CDDB Category")
#define VLC_META_CDDB_DISCID N_("CDDB Disc ID")
#define VLC_META_CDDB_EXT_DATA N_("CDDB Extended Data")
#define VLC_META_CDDB_GENRE N_("CDDB Genre")
#define VLC_META_CDDB_YEAR N_("CDDB Year")
#define VLC_META_CDDB_YEAR N_("CDDB Year")
#define VLC_META_CDDB_TITLE N_("CDDB Title")
#define VLC_META_CDTEXT_ARRANGER N_("CD-Text Arranger")
......@@ -55,11 +55,11 @@
#define VLC_META_CDTEXT_PERFORMER N_("CD-Text Performer")
#define VLC_META_CDTEXT_TITLE N_("CD-Text Title")
#define VLC_META_ISO_APPLICATION_ID N_("ISO-9660 Application ID")
#define VLC_META_ISO_PREPARER N_("ISO-9660 Preparer")
#define VLC_META_ISO_PUBLISHER N_("ISO-9660 Publisher")
#define VLC_META_ISO_VOLUME N_("ISO-9660 Volume")
#define VLC_META_ISO_VOLUMESET N_("ISO-9660 Volume Set")
#define VLC_META_ISO_APPLICATION_ID N_("ISO-9660 Application ID")
#define VLC_META_ISO_PREPARER N_("ISO-9660 Preparer")
#define VLC_META_ISO_PUBLISHER N_("ISO-9660 Publisher")
#define VLC_META_ISO_VOLUME N_("ISO-9660 Volume")
#define VLC_META_ISO_VOLUMESET N_("ISO-9660 Volume Set")
#define VLC_META_CODEC_NAME N_("Codec Name")
#define VLC_META_CODEC_DESCRIPTION N_("Codec Description")
......
/*****************************************************************************
* vlc_objects.h: vlc_object_t definition.
* vlc_objects.h: vlc_object_t definition and manipulation methods
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* $Id$
......
/*****************************************************************************
* vlc_stream.h
* vlc_stream.h: Stream (between access and demux) descriptor and methods
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* $Id$
......
/*****************************************************************************
* tls.c
* tls.c: TLS wrapper
*****************************************************************************
* Copyright (C) 2004-2005 the VideoLAN team
* $Id$
......@@ -46,10 +46,10 @@ struct tls_server_t
void *p_sys;
void (*pf_delete) ( tls_server_t * );
int (*pf_add_CA) ( tls_server_t *, const char * );
int (*pf_add_CRL) ( tls_server_t *, const char * );
tls_session_t * (*pf_session_prepare) ( tls_server_t * );
};
......
......@@ -57,7 +57,7 @@ typedef struct plane_t
*/
struct picture_t
{
/**
/**
* The properties of the picture
*/
video_frame_format_t format;
......
/*****************************************************************************
* vlc_vlm.h: VLM interface plugin
* vlc_vlm.h: VLM core structures
*****************************************************************************
* Copyright (C) 2000, 2001 the VideoLAN team
* $Id$
......
/*****************************************************************************
* xml.h
* xml.h: XML abstraction layer
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* $Id$
......
/*****************************************************************************
* vout_synchro.h: frame-dropping structures
* Only used in libmpeg2 decoder at the moment
*****************************************************************************
* Copyright (C) 1999-2005 the VideoLAN team
* $Id$
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment