[vlc-devel] commit: VLM: remove the unneeded sout-keep hack ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Jun 4 20:16:11 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jun  4 20:45:43 2008 +0300| [0c3914d0a43ef2132131828967146169343a39d6]

VLM: remove the unneeded sout-keep hack

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

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

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 60e96ce..a1cc9b3 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -515,7 +515,6 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
             for( i = 0; i < p_cfg->i_option; i++ )
                 input_ItemAddOption( p_media->vod.p_item,
                                      p_cfg->ppsz_option[i] );
-            input_ItemAddOption( p_media->vod.p_item, "no-sout-keep" );
 
             asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name );
 
@@ -823,15 +822,6 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
             else
                 input_ItemAddOption( p_instance->p_item, p_cfg->ppsz_option[i] );
         }
-        /* We force the right sout-keep value (avoid using the sout-keep from the global configuration)
-         * FIXME implement input list for VOD (need sout-keep)
-         * */
-        if( !p_cfg->b_vod && p_instance->b_sout_keep )
-            psz_keep = "sout-keep";
-        else
-            psz_keep = "no-sout-keep";
-        input_ItemAddOption( p_instance->p_item, psz_keep );
-
         TAB_APPEND( p_media->i_instance, p_media->instance, p_instance );
     }
 




More information about the vlc-devel mailing list