[vlc-devel] commit: sout_es: use var_GetString. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Oct 15 10:03:50 2009 +0200| [8641c42f00a3025353f881afe57bc6e6b7f4e5ea] | committer: Rémi Duraffort 

sout_es: use var_GetString.

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

 modules/stream_out/es.c |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index eade059..c3e20ab 100644
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -149,7 +149,6 @@ static int Open( vlc_object_t *p_this )
 {
     sout_stream_t       *p_stream = (sout_stream_t*)p_this;
     sout_stream_sys_t   *p_sys;
-    vlc_value_t         val;
 
     config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg );
     p_sys                   = malloc( sizeof( sout_stream_sys_t ) );
@@ -158,26 +157,17 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_count_audio    = 0;
     p_sys->i_count_video    = 0;
 
-    var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
-    p_sys->psz_access       = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "access-audio", &val );
-    p_sys->psz_access_audio = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "access-video", &val );
-    p_sys->psz_access_video = val.psz_string;
-
-    var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val );
-    p_sys->psz_mux       = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "mux-audio", &val );
-    p_sys->psz_mux_audio = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "mux-video", &val );
-    p_sys->psz_mux_video = val.psz_string;
-
-    var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
-    p_sys->psz_dst       = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "dst-audio", &val );
-    p_sys->psz_dst_audio = val.psz_string;
-    var_Get( p_stream, SOUT_CFG_PREFIX "dst-video", &val );
-    p_sys->psz_dst_video = val.psz_string;
+    p_sys->psz_access = var_GetString( p_stream, SOUT_CFG_PREFIX "access" );
+    p_sys->psz_access_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "access-audio" );
+    p_sys->psz_access_video = var_GetString( p_stream, SOUT_CFG_PREFIX "access-video" );
+
+    p_sys->psz_mux = var_GetString( p_stream, SOUT_CFG_PREFIX "mux" );
+    p_sys->psz_mux_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-audio" );
+    p_sys->psz_mux_video = var_GetString( p_stream, SOUT_CFG_PREFIX "mux-video" );
+
+    p_sys->psz_dst       = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" );
+    p_sys->psz_dst_audio = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-audio" );
+    p_sys->psz_dst_video = var_GetString( p_stream, SOUT_CFG_PREFIX "dst-video" );
 
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;