From 2dca7b70bd067265a506794bbeed120da130fcd9 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Thu, 21 Apr 2011 18:27:46 +0200 Subject: [PATCH] Revert "input: dvb: also create program data for programs on the same frequency" This reverts commit 5e35aa8c02c71b21b179aebb6eb3429fcded0709. Merging all epg data on current input item isn't a great idea as, outside event handlers, we can't really guess which one is related to our current program. It also allocates extr metadata. We'll need to store that epg data in a different place. --- src/input/es_out.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index a6e3fef64b..fb9c289e47 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -1195,6 +1195,8 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_me return; } /* Find program */ + if( !EsOutIsProgramVisible( out, i_group ) ) + return; p_pgrm = EsOutProgramFind( out, i_group ); if( !p_pgrm ) return; @@ -1231,7 +1233,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_me } /* ugly but it works */ - if( EsOutIsProgramVisible( out, i_group ) && psz_text ) + if( psz_text ) { input_SendEventProgramDel( p_input, i_group ); input_SendEventProgramAdd( p_input, i_group, psz_text ); @@ -1286,6 +1288,8 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, const vlc_epg_t *p_epg char *psz_cat; /* Find program */ + if( !EsOutIsProgramVisible( out, i_group ) ) + return; p_pgrm = EsOutProgramFind( out, i_group ); if( !p_pgrm ) return; -- 2.11.4.GIT