[vlc-commits] demux: use stream_vaControl() where applicable (fixes #9302)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep  2 23:45:36 2013 +0300| [cbae8d3be2b3881ff9e84b2dfb3c335f27dd3cd2] | committer: Rémi Denis-Courmont

demux: use stream_vaControl() where applicable (fixes #9302)

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

 modules/demux/ps.c |    6 +++---
 modules/demux/ts.c |    8 ++++----
 src/input/demux.c  |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 7dc9aa7..89ed268 100644
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -542,13 +542,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         }
 
         case DEMUX_SET_TITLE:
-            return stream_Control( p_demux->s, STREAM_SET_TITLE, args );
+            return stream_vaControl( p_demux->s, STREAM_SET_TITLE, args );
 
         case DEMUX_SET_SEEKPOINT:
-            return stream_Control( p_demux->s, STREAM_SET_SEEKPOINT, args );
+            return stream_vaControl( p_demux->s, STREAM_SET_SEEKPOINT, args );
 
         case DEMUX_GET_META:
-            return stream_Control( p_demux->s, STREAM_GET_META, args );
+            return stream_vaControl( p_demux->s, STREAM_GET_META, args );
 
         case DEMUX_GET_FPS:
         default:
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index b958408..e8608b4 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1201,13 +1201,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     }
 
     case DEMUX_SET_TITLE:
-        return stream_Control( p_demux->s, STREAM_SET_TITLE, args );
+        return stream_vaControl( p_demux->s, STREAM_SET_TITLE, args );
 
     case DEMUX_SET_SEEKPOINT:
-        return stream_Control( p_demux->s, STREAM_SET_SEEKPOINT, args );
+        return stream_vaControl( p_demux->s, STREAM_SET_SEEKPOINT, args );
 
     case DEMUX_GET_META:
-        return stream_Control( p_demux->s, STREAM_GET_META, args );
+        return stream_vaControl( p_demux->s, STREAM_GET_META, args );
 
     case DEMUX_CAN_RECORD:
         pb_bool = (bool*)va_arg( args, bool * );
@@ -1223,7 +1223,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         return VLC_SUCCESS;
 
     case DEMUX_GET_SIGNAL:
-        return stream_Control( p_demux->s, STREAM_GET_SIGNAL, args );
+        return stream_vaControl( p_demux->s, STREAM_GET_SIGNAL, args );
 
     default:
         return VLC_EGENERIC;
diff --git a/src/input/demux.c b/src/input/demux.c
index 5730e47..86e2082 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -312,7 +312,7 @@ int demux_vaControlHelper( stream_t *s,
             return VLC_EGENERIC;
 
         case DEMUX_GET_META:
-            return stream_Control( s, STREAM_GET_META, args );
+            return stream_vaControl( s, STREAM_GET_META, args );
 
         case DEMUX_GET_PTS_DELAY:
         case DEMUX_GET_FPS: