[vlc-commits] Revert "input: dvb: also create program data for programs on the same frequency"

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 21 18:27:46 2011 +0200| [2dca7b70bd067265a506794bbeed120da130fcd9] | committer: Francois Cartegnie

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2dca7b70bd067265a506794bbeed120da130fcd9
---

 src/input/es_out.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index a6e3fef..fb9c289 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;