From acd2a608009e5ba7e58d9787b7b954701c52f1e2 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Thu, 28 Apr 2005 07:45:51 +0000 Subject: [PATCH] * es_out: oops, make EsOutProgramDel returning an error code. --- src/input/es_out.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index 1bfbe36a63..859cf9ea62 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -499,7 +499,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group ) /* EsOutDelProgram: * Delete a program */ -static void EsOutProgramDel( es_out_t *out, int i_group ) +static int EsOutProgramDel( es_out_t *out, int i_group ) { es_out_sys_t *p_sys = out->p_sys; input_thread_t *p_input = p_sys->p_input; @@ -516,13 +516,14 @@ static void EsOutProgramDel( es_out_t *out, int i_group ) } } - if( p_pgrm == NULL ) return; + if( p_pgrm == NULL ) + return VLC_EGENERIC; if( p_pgrm->i_es ) { msg_Dbg( p_input, "can't delete program %d which still has %i ES", i_group, p_pgrm->i_es ); - return; + return VLC_EGENERIC; } TAB_REMOVE( p_sys->i_pgrm, p_sys->pgrm, p_pgrm ); @@ -538,6 +539,8 @@ static void EsOutProgramDel( es_out_t *out, int i_group ) var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL ); var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE ); + + return VLC_SUCCESS; } /* EsOutProgramMeta: @@ -1057,8 +1060,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es ) es->p_pgrm->i_es--; if( es->p_pgrm->i_es == 0 ) { - msg_Warn( p_sys->p_input, "Program doesn't contain anymore ES, " - "TODO cleaning ?" ); + msg_Dbg( p_sys->p_input, "Program doesn't contain anymore ES" ); } if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL; -- 2.39.2