[vlc-devel] commit: Revert "INPUT: Properly remove SDT and EPG entries on exit" ( Laurent Aimar )

git version control git at videolan.org
Tue Sep 22 22:59:45 CEST 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Sep 22 22:26:54 2009 +0200| [2d60460f5bfd4d3bc9e37b8172a28475bce015c9] | committer: Laurent Aimar 

Revert "INPUT: Properly remove SDT and EPG entries on exit"

This reverts commit 6fc6b16d506665d3ee4ede58c444de68491a61bc.

I need it for input_item_SetEpgOffline (next commit).

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

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

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 30c5326..e647aa1 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -329,7 +329,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
 static void EsOutDelete( es_out_t *out )
 {
     es_out_sys_t *p_sys = out->p_sys;
-    input_thread_t *p_input = p_sys->p_input;
     int i;
 
     if( p_sys->p_sout_record )
@@ -365,18 +364,6 @@ static void EsOutDelete( es_out_t *out )
     {
         es_out_pgrm_t *p_pgrm = p_sys->pgrm[i];
         input_clock_Delete( p_pgrm->p_clock );
-
-        /* Remove SDT and EPG entries */
-        char *psz_cat = EsOutProgramGetMetaName( p_pgrm );
-        input_Control( p_input, INPUT_DEL_INFO, psz_cat, NULL );
-        char *psz_epg;
-        if( asprintf( &psz_epg, "EPG %s", psz_cat ) >= 0 )
-        {
-            input_Control( p_input, INPUT_DEL_INFO, psz_epg, NULL );
-            free( psz_epg );
-        }
-        free( psz_cat );
-
         free( p_pgrm->psz_now_playing );
         free( p_pgrm->psz_publisher );
         free( p_pgrm->psz_name );




More information about the vlc-devel mailing list