maven2 project structure

[vlc] / include / vlc_access.h

diff --git a/include/vlc_access.h b/include/vlc_access.h
index f95520825d94151ade5b80c0668f7174a42e6133..8a9b006e8592ebe83b85e1be9f79c699287978cb 100644 (file)
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_access.h: Access descriptor, queries and methods
  *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -21,9 +21,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_ACCESS_H
 #define _VLC_ACCESS_H 1
 
+#include <vlc_block.h>
+
 /**
  * \defgroup access Access
  * @{
@@ -56,7 +62,9 @@ enum access_query_e
      * XXX: avoid to use it unless you can't */
     ACCESS_SET_PRIVATE_ID_STATE,    /* arg1= int i_private_data, vlc_bool_t b_selected can fail */
     ACCESS_SET_PRIVATE_ID_CA,    /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */
-    ACCESS_GET_PRIVATE_ID_STATE     /* arg1=int i_private_data arg2=vlc_bool_t *  res=can fail */
+    ACCESS_GET_PRIVATE_ID_STATE,    /* arg1=int i_private_data arg2=vlc_bool_t *  res=can fail */
+
+    ACCESS_GET_CONTENT_TYPE, /* arg1=char **ppsz_content_type */
 };
 
 struct access_t
@@ -74,13 +82,13 @@ struct access_t
     access_t    *p_source;
 
     /* Access can fill this entry to force a demuxer
-     * XXX: fill it once you know for sure you will succed
+     * XXX: fill it once you know for sure you will succeed
      * (if you fail, this value won't be reseted */
     char        *psz_demux;
 
     /* pf_read/pf_block is used to read data.
      * XXX A access should set one and only one of them */
-    int         (*pf_read) ( access_t *, uint8_t *, int );  /* Return -1 if no data yet, 0 if no more data, else real data read */
+    ssize_t     (*pf_read) ( access_t *, uint8_t *, size_t );  /* Return -1 if no data yet, 0 if no more data, else real data read */
     block_t    *(*pf_block)( access_t * );                  /* return a block of data in his 'natural' size, NULL if not yet data or eof */
 
     /* Called for each seek.
@@ -109,16 +117,13 @@ struct access_t
     access_sys_t *p_sys;
 };
 
-#define access2_New( a, b, c, d, e ) __access2_New(VLC_OBJECT(a), b, c, d, e )
-VLC_EXPORT( access_t *, __access2_New,  ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, vlc_bool_t b_quick ) );
-VLC_EXPORT( access_t *, access2_FilterNew, ( access_t *p_source, char *psz_access_filter ) );
-VLC_EXPORT( void,      access2_Delete, ( access_t * ) );
-
 static inline int access2_vaControl( access_t *p_access, int i_query, va_list args )
 {
     if( !p_access ) return VLC_EGENERIC;
+    assert( p_access->pf_control );
     return p_access->pf_control( p_access, i_query, args );
 }
+
 static inline int access2_Control( access_t *p_access, int i_query, ... )
 {
     va_list args;
@@ -130,7 +135,15 @@ static inline int access2_Control( access_t *p_access, int i_query, ... )
     return i_result;
 }
 
-static void inline access_InitFields( access_t *p_a )
+static inline char *access_GetContentType( access_t *p_access )
+{
+    char *res;
+    if( access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
+        return NULL;
+    return res;
+}
+
+static inline void access_InitFields( access_t *p_a )
 {
     p_a->info.i_update = 0;
     p_a->info.i_size = 0;