From 8e8dada27fbcbfb07fea99eb12cc34e384e24d10 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 7 Sep 2003 22:49:05 +0000 Subject: [PATCH] * all : set pf_demux_control. --- modules/access/cdda.c | 3 ++- modules/access/dshow/dshow.cpp | 3 ++- modules/access/dvd/demux.c | 3 ++- modules/access/dvdplay/demux.c | 3 ++- modules/access/dvdread/input.c | 3 ++- modules/access/slp.c | 3 ++- modules/access/v4l/v4l.c | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 20767b5a20..e3c6cf26f4 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -2,7 +2,7 @@ * cdda.c : CD digital audio input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: cdda.c,v 1.5 2003/06/17 20:03:50 hartman Exp $ + * $Id: cdda.c,v 1.6 2003/09/07 22:49:05 fenrir Exp $ * * Authors: Laurent Aimar * Gildas Bazin @@ -401,6 +401,7 @@ static int CDDAOpenDemux ( vlc_object_t * p_this) p_demux->p_es = NULL; p_input->pf_demux = CDDADemux; + p_input->pf_demux_control = demux_vaControlDefault; p_input->pf_rewind = NULL; p_input->p_demux_data = p_demux; diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index c7ba49a20a..8124e1f94a 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -2,7 +2,7 @@ * dshow.c : DirectShow access module for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: dshow.cpp,v 1.7 2003/08/31 22:06:17 gbazin Exp $ + * $Id: dshow.cpp,v 1.8 2003/09/07 22:49:05 fenrir Exp $ * * Author: Gildas Bazin * @@ -1123,6 +1123,7 @@ static int DemuxOpen( vlc_object_t *p_this ) } p_input->pf_demux = Demux; + p_input->pf_demux_control = demux_vaControlDefault; return VLC_SUCCESS; } diff --git a/modules/access/dvd/demux.c b/modules/access/dvd/demux.c index 21ef8366c5..6754a069f4 100644 --- a/modules/access/dvd/demux.c +++ b/modules/access/dvd/demux.c @@ -1,7 +1,7 @@ /* demux.c: DVD demux functions. ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: demux.c,v 1.2 2002/08/07 00:29:36 sam Exp $ + * $Id: demux.c,v 1.3 2003/09/07 22:49:05 fenrir Exp $ * * Author: Stéphane Borel * @@ -93,6 +93,7 @@ int E_(DVDInit) ( vlc_object_t *p_this ) } p_input->pf_demux = DVDDemux; + p_input->pf_demux_control = demux_vaControlDefault; p_input->pf_rewind = NULL; vlc_mutex_lock( &p_input->stream.stream_lock ); diff --git a/modules/access/dvdplay/demux.c b/modules/access/dvdplay/demux.c index 679e343dea..afd1a465ea 100644 --- a/modules/access/dvdplay/demux.c +++ b/modules/access/dvdplay/demux.c @@ -2,7 +2,7 @@ * demux.c: demux functions for dvdplay. ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: demux.c,v 1.6 2003/02/07 00:29:53 sam Exp $ + * $Id: demux.c,v 1.7 2003/09/07 22:49:05 fenrir Exp $ * * Author: Stéphane Borel * @@ -102,6 +102,7 @@ int E_(InitDVD) ( vlc_object_t *p_this ) p_input->p_demux_data->p_dvd = p_dvd; p_input->pf_demux = Demux; + p_input->pf_demux_control = demux_vaControlDefault; p_input->pf_rewind = NULL; p_dvd->p_intf = intf_Create( p_input, "dvdplay" ); diff --git a/modules/access/dvdread/input.c b/modules/access/dvdread/input.c index 740d55d580..073c615551 100644 --- a/modules/access/dvdread/input.c +++ b/modules/access/dvdread/input.c @@ -6,7 +6,7 @@ * It depends on: libdvdread for ifo files and block reading. ***************************************************************************** * Copyright (C) 2001, 2003 VideoLAN - * $Id: input.c,v 1.22 2003/05/08 19:06:44 titer Exp $ + * $Id: input.c,v 1.23 2003/09/07 22:49:05 fenrir Exp $ * * Author: Stéphane Borel * @@ -129,6 +129,7 @@ int E_(InitDVD) ( vlc_object_t *p_this ) } p_input->pf_demux = DvdReadDemux; + p_input->pf_demux_control = demux_vaControlDefault; p_input->pf_rewind = NULL; vlc_mutex_lock( &p_input->stream.stream_lock ); diff --git a/modules/access/slp.c b/modules/access/slp.c index dd1281ff25..50ad82ab8c 100644 --- a/modules/access/slp.c +++ b/modules/access/slp.c @@ -2,7 +2,7 @@ * slp.c: SLP access plugin ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: slp.c,v 1.14 2003/08/10 12:45:52 zorglub Exp $ + * $Id: slp.c,v 1.15 2003/09/07 22:49:05 fenrir Exp $ * * Authors: Loïc Minier * @@ -415,6 +415,7 @@ static int Init ( vlc_object_t *p_this ) } p_input->pf_demux = Demux; + p_input->pf_demux_control = demux_vaControlDefault; p_input->pf_rewind = NULL; return VLC_SUCCESS; diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c index db6b650ea9..39365343a2 100644 --- a/modules/access/v4l/v4l.c +++ b/modules/access/v4l/v4l.c @@ -2,7 +2,7 @@ * v4l.c : Video4Linux input module for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: v4l.c,v 1.23 2003/08/30 11:59:44 gbazin Exp $ + * $Id: v4l.c,v 1.24 2003/09/07 22:49:05 fenrir Exp $ * * Author: Laurent Aimar * Paul Forgey @@ -1399,6 +1399,7 @@ static int DemuxOpen( vlc_object_t *p_this ) } p_input->pf_demux = Demux; + p_input->pf_demux_control = demux_vaControlDefault; return VLC_SUCCESS; } -- 2.39.2