Changeset 6e9df1a6258d221c0d505259249bc905782875d7

Show
Ignore:
Timestamp:
29/08/08 17:55:58 (3 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1220025358 +0300
git-parent:

[631a4861beef2ec7fdf7cbfbde1fd5ce10dbc5ee]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1220020952 +0300
Message:

sout_AccessOutNew: allow any VLC object type, not just sout instance

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_sout.h

    r631a486 r6e9df1a  
    9898    ssize_t                 (*pf_read)( sout_access_out_t *, block_t * ); 
    9999    ssize_t                 (*pf_write)( sout_access_out_t *, block_t * ); 
    100     int                     (*pf_control)( sout_access_out_t *, int, va_list); 
     100    int                     (*pf_control)( sout_access_out_t *, int, va_list ); 
    101101 
    102102    config_chain_t          *p_cfg; 
    …… 
    108108}; 
    109109 
    110 VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( sout_instance_t *, const char *psz_access, const char *psz_name ) ); 
    111 VLC_EXPORT( void,               sout_AccessOutDelete, ( sout_access_out_t * ) ); 
    112 VLC_EXPORT( int,                sout_AccessOutSeek,   ( sout_access_out_t *, off_t ) ); 
    113 VLC_EXPORT( ssize_t,            sout_AccessOutRead,   ( sout_access_out_t *, block_t * ) ); 
    114 VLC_EXPORT( ssize_t,            sout_AccessOutWrite,  ( sout_access_out_t *, block_t * ) ); 
    115 VLC_EXPORT( int,                sout_AccessOutControl,( sout_access_out_t *, int, ... ) ); 
     110VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( vlc_object_t *, const char *psz_access, const char *psz_name ) ); 
     111#define sout_AccessOutNew( obj, access, name ) \ 
     112        sout_AccessOutNew( VLC_OBJECT(obj), access, name ) 
     113VLC_EXPORT( void, sout_AccessOutDelete, ( sout_access_out_t * ) ); 
     114VLC_EXPORT( int, sout_AccessOutSeek, ( sout_access_out_t *, off_t ) ); 
     115VLC_EXPORT( ssize_t, sout_AccessOutRead, ( sout_access_out_t *, block_t * ) ); 
     116VLC_EXPORT( ssize_t, sout_AccessOutWrite, ( sout_access_out_t *, block_t * ) ); 
     117VLC_EXPORT( int, sout_AccessOutControl, ( sout_access_out_t *, int, ... ) ); 
    116118 
    117119static inline bool sout_AccessOutCanControlPace( sout_access_out_t *p_ao ) 

  • src/stream_output/stream_output.c

    r631a486 r6e9df1a  
    289289} 
    290290 
     291#undef sout_AccessOutNew 
    291292/***************************************************************************** 
    292293 * sout_AccessOutNew: allocate a new access out 
    293294 *****************************************************************************/ 
    294 sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, 
     295sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout, 
    295296                                      const char *psz_access, const char *psz_name ) 
    296297{