Commit 29ec3042 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Guard headerfiles in modules/access/mms/*.h against multiple inclusions.

parent 5de91b63
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef _ASF_H_
#define _ASF_H_ 1
#define ASF_STREAM_VIDEO 0x0001 #define ASF_STREAM_VIDEO 0x0001
#define ASF_STREAM_AUDIO 0x0002 #define ASF_STREAM_AUDIO 0x0002
#define ASF_STREAM_UNKNOWN 0xffff #define ASF_STREAM_UNKNOWN 0xffff
...@@ -49,7 +52,6 @@ typedef struct ...@@ -49,7 +52,6 @@ typedef struct
} asf_header_t; } asf_header_t;
typedef struct guid_s typedef struct guid_s
{ {
uint32_t v1; /* le */ uint32_t v1; /* le */
...@@ -65,7 +67,6 @@ void E_( asf_StreamSelect ) ( asf_header_t *, ...@@ -65,7 +67,6 @@ void E_( asf_StreamSelect ) ( asf_header_t *,
int i_bitrate_max, vlc_bool_t b_all, vlc_bool_t b_audio, int i_bitrate_max, vlc_bool_t b_all, vlc_bool_t b_audio,
vlc_bool_t b_video ); vlc_bool_t b_video );
#define GUID_FMT "%8.8x-%4.4x-%4.4x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x" #define GUID_FMT "%8.8x-%4.4x-%4.4x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
#define GUID_PRINT( guid ) \ #define GUID_PRINT( guid ) \
(guid).v1, \ (guid).v1, \
...@@ -145,3 +146,5 @@ static const guid_t asf_object_header_extension_guid = ...@@ -145,3 +146,5 @@ static const guid_t asf_object_header_extension_guid =
0x11CF, 0x11CF,
{ 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 } { 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }
}; };
#endif
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _MMS_BUFFER_H_
#define _MMS_BUFFER_H_ 1
typedef struct typedef struct
{ {
uint8_t *p_data; // pointer on data uint8_t *p_data; // pointer on data
...@@ -30,7 +33,6 @@ typedef struct ...@@ -30,7 +33,6 @@ typedef struct
int i_size; // size of p_data memory allocated int i_size; // size of p_data memory allocated
} var_buffer_t; } var_buffer_t;
/***************************************************************************** /*****************************************************************************
* Macro/Function to create/manipulate buffer * Macro/Function to create/manipulate buffer
*****************************************************************************/ *****************************************************************************/
...@@ -54,3 +56,4 @@ int var_buffer_getmemory ( var_buffer_t *p_buf, void *p_mem, int64_t i_mem ...@@ -54,3 +56,4 @@ int var_buffer_getmemory ( var_buffer_t *p_buf, void *p_mem, int64_t i_mem
int var_buffer_readempty( var_buffer_t *p_buf ); int var_buffer_readempty( var_buffer_t *p_buf );
void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid ); void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid );
#endif
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _MMS_H_
#define _MMS_H_ 1
#define MMS_PROTO_AUTO 0 #define MMS_PROTO_AUTO 0
#define MMS_PROTO_TCP 1 #define MMS_PROTO_TCP 1
#define MMS_PROTO_UDP 2 #define MMS_PROTO_UDP 2
#define MMS_PROTO_HTTP 3 #define MMS_PROTO_HTTP 3
/* mmst and mmsu */ /* mmst and mmsu */
int E_( MMSTUOpen ) ( access_t * ); int E_( MMSTUOpen ) ( access_t * );
void E_( MMSTUClose ) ( access_t * ); void E_( MMSTUClose ) ( access_t * );
...@@ -34,3 +36,6 @@ void E_( MMSTUClose ) ( access_t * ); ...@@ -34,3 +36,6 @@ void E_( MMSTUClose ) ( access_t * );
/* mmsh */ /* mmsh */
int E_( MMSHOpen ) ( access_t * ); int E_( MMSHOpen ) ( access_t * );
void E_( MMSHClose ) ( access_t * ); void E_( MMSHClose ) ( access_t * );
#endif
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _MMSH_H_
#define _MMSH_H_ 1
typedef struct typedef struct
{ {
uint16_t i_type; uint16_t i_type;
...@@ -66,3 +69,5 @@ struct access_sys_t ...@@ -66,3 +69,5 @@ struct access_sys_t
asf_header_t asfh; asf_header_t asfh;
guid_t guid; guid_t guid;
}; };
#endif
...@@ -21,13 +21,15 @@ ...@@ -21,13 +21,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _MMSTU_H_
#define _MMSTU_H_ 1
#define MMS_PACKET_ANY 0 #define MMS_PACKET_ANY 0
#define MMS_PACKET_CMD 1 #define MMS_PACKET_CMD 1
#define MMS_PACKET_HEADER 2 #define MMS_PACKET_HEADER 2
#define MMS_PACKET_MEDIA 3 #define MMS_PACKET_MEDIA 3
#define MMS_PACKET_UDP_TIMING 4 #define MMS_PACKET_UDP_TIMING 4
#define MMS_CMD_HEADERSIZE 48 #define MMS_CMD_HEADERSIZE 48
#define MMS_BUFFER_SIZE 100000 #define MMS_BUFFER_SIZE 100000
...@@ -86,7 +88,8 @@ struct access_sys_t ...@@ -86,7 +88,8 @@ struct access_sys_t
int i_max_bit_rate; int i_max_bit_rate;
int i_header_size; int i_header_size;
/* */ /* misc */
vlc_bool_t b_seekable; vlc_bool_t b_seekable;
}; };
#endif
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