Changeset c8a5be75a55d0a5dbda485f39c9f52c8de6fed06

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

[560ccaae6d32302eb8b913b3c07a3335df917576]

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

Add ACCESS_OUT_CAN_CONTROL_PACE, fix AccessOutControl? prototype

(My fault - fortunately, sout_AccessOutControl was unused)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_sout.h

    rebd8003 rc8a5be7  
    22 * stream_output.h : stream output module 
    33 ***************************************************************************** 
    4  * Copyright (C) 2002-2007 the VideoLAN team 
     4 * Copyright (C) 2002-2008 the VideoLAN team 
    55 * $Id$ 
    66 * 
    …… 
    99 *          Eric Petit <titer@videolan.org> 
    1010 *          Jean-Paul Saman <jpsaman #_at_# m2x.nl> 
     11 *          Rémi Denis-Courmont 
    1112 * 
    1213 * This program is free software; you can redistribute it and/or modify 
    …… 
    99100    int                     (*pf_control)( sout_access_out_t *, int, va_list); 
    100101 
    101     config_chain_t              *p_cfg; 
     102    config_chain_t          *p_cfg; 
    102103    sout_instance_t         *p_sout; 
     104}; 
     105 
     106enum access_out_query_e 
     107{ 
     108    ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */ 
    103109}; 
    104110 
    …… 
    108114VLC_EXPORT( ssize_t,            sout_AccessOutRead,   ( sout_access_out_t *, block_t * ) ); 
    109115VLC_EXPORT( ssize_t,            sout_AccessOutWrite,  ( sout_access_out_t *, block_t * ) ); 
    110 VLC_EXPORT( int,                sout_AccessOutControl,( sout_access_out_t *, int, va_list ) ); 
     116VLC_EXPORT( int,                sout_AccessOutControl,( sout_access_out_t *, int, ... ) ); 
     117 
     118static inline bool sout_AccessOutCanControlPace( sout_access_out_t *p_ao ) 
     119{ 
     120    bool b; 
     121    if( sout_AccessOutControl( p_ao, ACCESS_OUT_CONTROLS_PACE, &b ) ) 
     122        return true; 
     123    return b; 
     124} 
    111125 
    112126/** Muxer structure */ 

  • src/stream_output/stream_output.c

    rfa2757f rc8a5be7  
    391391 * sout_AccessOutControl 
    392392 */ 
    393 int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args) 
    394 { 
    395     return (access->pf_control) ? access->pf_control (access, query, args) 
    396                                 : VLC_EGENERIC; 
     393int sout_AccessOutControl (sout_access_out_t *access, int query, ...) 
     394{ 
     395    va_list ap; 
     396    int ret; 
     397 
     398    va_start (ap, query); 
     399    if (access->pf_control) 
     400        ret = access->pf_control (access, query, ap); 
     401    else 
     402        ret = VLC_EGENERIC; 
     403    va_end (ap); 
     404    return ret; 
    397405} 
    398406