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

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Mar 15 21:35:10 2011 +0100| [5e35aa8c02c71b21b179aebb6eb3429fcded0709] | committer: Francois Cartegnie

input: dvb: also create program data for programs on the same frequency

We create program entries, not only for current, but also all reachable
programs/pid on the same frequency (which are already seen, but skipped
in demux). But we keep only sending events regarding current program.
This allows generating data and displaying EPG entries for all available
channels

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

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

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 15b0d55..eb1390c 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1194,8 +1194,6 @@ 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;
@@ -1232,7 +1230,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_me
         }
 
         /* ugly but it works */
-        if( psz_text )
+        if( EsOutIsProgramVisible( out, i_group ) && psz_text )
         {
             input_SendEventProgramDel( p_input, i_group );
             input_SendEventProgramAdd( p_input, i_group, psz_text );
@@ -1287,8 +1285,6 @@ 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;