Skip to content

V
vlc
Commit f93b1504 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* all: compilation fix.

parent e414aa32
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 26 deletions
modules/mux/mpjpeg.c
View file @ f93b1504
...@@ -47,10 +47,10 @@ vlc_module_end(); ...@@ -47,10 +47,10 @@ vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Exported prototypes
*****************************************************************************/ *****************************************************************************/
static int Capability(sout_mux_t *, int, void *, void * ); static int Control ( sout_mux_t *, int, va_list );
static int AddStream( sout_mux_t *, sout_input_t * ); static int AddStream( sout_mux_t *, sout_input_t * );
static int DelStream( sout_mux_t *, sout_input_t * ); static int DelStream( sout_mux_t *, sout_input_t * );
static int Mux ( sout_mux_t * ); static int Mux ( sout_mux_t * );
struct sout_mux_sys_t struct sout_mux_sys_t
{ {
...@@ -68,7 +68,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -68,7 +68,7 @@ static int Open( vlc_object_t *p_this )
msg_Dbg( p_mux, "Multipart jpeg muxer opened" ); msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
p_mux->pf_capacity = Capability; p_mux->pf_control = Control;
p_mux->pf_addstream = AddStream; p_mux->pf_addstream = AddStream;
p_mux->pf_delstream = DelStream; p_mux->pf_delstream = DelStream;
p_mux->pf_mux = Mux; p_mux->pf_mux = Mux;
...@@ -95,17 +95,31 @@ static void Close( vlc_object_t * p_this ) ...@@ -95,17 +95,31 @@ static void Close( vlc_object_t * p_this )
free( p_sys ); free( p_sys );
} }
static int Capability( sout_mux_t *p_mux, int i_query, static int Control( sout_mux_t *p_mux, int i_query, va_list args )
void *p_args, void *p_answer )
{ {
switch( i_query ) vlc_bool_t *pb_bool;
{ char **ppsz;
case SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME:
*(vlc_bool_t*)p_answer = VLC_TRUE; switch( i_query )
return SOUT_MUX_CAP_ERR_OK; {
case MUX_CAN_ADD_STREAM_WHILE_MUXING:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
*pb_bool = VLC_TRUE;
return VLC_SUCCESS;
case MUX_GET_ADD_STREAM_WAIT:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
*pb_bool = VLC_TRUE;
return VLC_SUCCESS;
case MUX_GET_MIME:
ppsz = (char**)va_arg( args, char ** );
*ppsz = strdup( "image/jpeg" );
return VLC_SUCCESS;
default: default:
return SOUT_MUX_CAP_ERR_UNIMPLEMENTED; return VLC_EGENERIC;
} }
} }
static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
......
modules/mux/wav.c
View file @ f93b1504
...@@ -47,10 +47,10 @@ vlc_module_end(); ...@@ -47,10 +47,10 @@ vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Exported prototypes
*****************************************************************************/ *****************************************************************************/
static int Capability(sout_mux_t *, int, void *, void * ); static int Control ( sout_mux_t *, int, va_list );
static int AddStream( sout_mux_t *, sout_input_t * ); static int AddStream( sout_mux_t *, sout_input_t * );
static int DelStream( sout_mux_t *, sout_input_t * ); static int DelStream( sout_mux_t *, sout_input_t * );
static int Mux ( sout_mux_t * ); static int Mux ( sout_mux_t * );
struct sout_mux_sys_t struct sout_mux_sys_t
{ {
...@@ -69,7 +69,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -69,7 +69,7 @@ static int Open( vlc_object_t *p_this )
sout_mux_t *p_mux = (sout_mux_t*)p_this; sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys; sout_mux_sys_t *p_sys;
p_mux->pf_capacity = Capability; p_mux->pf_control = Control;
p_mux->pf_addstream = AddStream; p_mux->pf_addstream = AddStream;
p_mux->pf_delstream = DelStream; p_mux->pf_delstream = DelStream;
p_mux->pf_mux = Mux; p_mux->pf_mux = Mux;
...@@ -92,19 +92,32 @@ static void Close( vlc_object_t * p_this ) ...@@ -92,19 +92,32 @@ static void Close( vlc_object_t * p_this )
free( p_sys ); free( p_sys );
} }
static int Capability( sout_mux_t *p_mux, int i_query, static int Control( sout_mux_t *p_mux, int i_query, va_list args )
void *p_args, void *p_answer )
{ {
vlc_bool_t *pb_bool;
char **ppsz;
switch( i_query ) switch( i_query )
{ {
case SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME: case MUX_CAN_ADD_STREAM_WHILE_MUXING:
*(vlc_bool_t*)p_answer = VLC_FALSE; pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
return SOUT_MUX_CAP_ERR_OK; *pb_bool = VLC_FALSE;
return VLC_SUCCESS;
case MUX_GET_ADD_STREAM_WAIT:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
*pb_bool = VLC_TRUE;
return VLC_SUCCESS;
case MUX_GET_MIME:
ppsz = (char**)va_arg( args, char ** );
*ppsz = strdup( "audio/wav" );
return VLC_SUCCESS;
default: default:
return SOUT_MUX_CAP_ERR_UNIMPLEMENTED; return VLC_EGENERIC;
} }
} }
static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{ {
sout_mux_sys_t *p_sys = p_mux->p_sys; sout_mux_sys_t *p_sys = p_mux->p_sys;
......
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