Commit c8a5be75 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add ACCESS_OUT_CAN_CONTROL_PACE, fix AccessOutControl prototype

(My fault - fortunately, sout_AccessOutControl was unused)
parent 560ccaae
/***************************************************************************** /*****************************************************************************
* stream_output.h : stream output module * stream_output.h : stream output module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2007 the VideoLAN team * Copyright (C) 2002-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr> * Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
* Jean-Paul Saman <jpsaman #_at_# m2x.nl> * Jean-Paul Saman <jpsaman #_at_# m2x.nl>
* Rémi Denis-Courmont
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -98,16 +99,29 @@ struct sout_access_out_t ...@@ -98,16 +99,29 @@ struct sout_access_out_t
ssize_t (*pf_write)( sout_access_out_t *, block_t * ); ssize_t (*pf_write)( sout_access_out_t *, block_t * );
int (*pf_control)( sout_access_out_t *, int, va_list); int (*pf_control)( sout_access_out_t *, int, va_list);
config_chain_t *p_cfg; config_chain_t *p_cfg;
sout_instance_t *p_sout; sout_instance_t *p_sout;
}; };
enum access_out_query_e
{
ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */
};
VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( sout_instance_t *, const char *psz_access, const char *psz_name ) ); VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( sout_instance_t *, const char *psz_access, const char *psz_name ) );
VLC_EXPORT( void, sout_AccessOutDelete, ( sout_access_out_t * ) ); VLC_EXPORT( void, sout_AccessOutDelete, ( sout_access_out_t * ) );
VLC_EXPORT( int, sout_AccessOutSeek, ( sout_access_out_t *, off_t ) ); VLC_EXPORT( int, sout_AccessOutSeek, ( sout_access_out_t *, off_t ) );
VLC_EXPORT( ssize_t, sout_AccessOutRead, ( sout_access_out_t *, block_t * ) ); VLC_EXPORT( ssize_t, sout_AccessOutRead, ( sout_access_out_t *, block_t * ) );
VLC_EXPORT( ssize_t, sout_AccessOutWrite, ( sout_access_out_t *, block_t * ) ); VLC_EXPORT( ssize_t, sout_AccessOutWrite, ( sout_access_out_t *, block_t * ) );
VLC_EXPORT( int, sout_AccessOutControl,( sout_access_out_t *, int, va_list ) ); VLC_EXPORT( int, sout_AccessOutControl,( sout_access_out_t *, int, ... ) );
static inline bool sout_AccessOutCanControlPace( sout_access_out_t *p_ao )
{
bool b;
if( sout_AccessOutControl( p_ao, ACCESS_OUT_CONTROLS_PACE, &b ) )
return true;
return b;
}
/** Muxer structure */ /** Muxer structure */
struct sout_mux_t struct sout_mux_t
......
...@@ -390,10 +390,18 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) ...@@ -390,10 +390,18 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
/** /**
* sout_AccessOutControl * sout_AccessOutControl
*/ */
int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args) int sout_AccessOutControl (sout_access_out_t *access, int query, ...)
{ {
return (access->pf_control) ? access->pf_control (access, query, args) va_list ap;
: VLC_EGENERIC; int ret;
va_start (ap, query);
if (access->pf_control)
ret = access->pf_control (access, query, ap);
else
ret = VLC_EGENERIC;
va_end (ap);
return ret;
} }
/***************************************************************************** /*****************************************************************************
......
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