Commit 8e8dada2 authored by Laurent Aimar's avatar Laurent Aimar

* all : set pf_demux_control.

parent 091aff73
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* cdda.c : CD digital audio input module for vlc * cdda.c : CD digital audio input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * 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 <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -401,6 +401,7 @@ static int CDDAOpenDemux ( vlc_object_t * p_this) ...@@ -401,6 +401,7 @@ static int CDDAOpenDemux ( vlc_object_t * p_this)
p_demux->p_es = NULL; p_demux->p_es = NULL;
p_input->pf_demux = CDDADemux; p_input->pf_demux = CDDADemux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL; p_input->pf_rewind = NULL;
p_input->p_demux_data = p_demux; p_input->p_demux_data = p_demux;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dshow.c : DirectShow access module for vlc * dshow.c : DirectShow access module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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 <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -1123,6 +1123,7 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -1123,6 +1123,7 @@ static int DemuxOpen( vlc_object_t *p_this )
} }
p_input->pf_demux = Demux; p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
/* demux.c: DVD demux functions. /* demux.c: DVD demux functions.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -93,6 +93,7 @@ int E_(DVDInit) ( vlc_object_t *p_this ) ...@@ -93,6 +93,7 @@ int E_(DVDInit) ( vlc_object_t *p_this )
} }
p_input->pf_demux = DVDDemux; p_input->pf_demux = DVDDemux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL; p_input->pf_rewind = NULL;
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* demux.c: demux functions for dvdplay. * demux.c: demux functions for dvdplay.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -102,6 +102,7 @@ int E_(InitDVD) ( vlc_object_t *p_this ) ...@@ -102,6 +102,7 @@ int E_(InitDVD) ( vlc_object_t *p_this )
p_input->p_demux_data->p_dvd = p_dvd; p_input->p_demux_data->p_dvd = p_dvd;
p_input->pf_demux = Demux; p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL; p_input->pf_rewind = NULL;
p_dvd->p_intf = intf_Create( p_input, "dvdplay" ); p_dvd->p_intf = intf_Create( p_input, "dvdplay" );
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* It depends on: libdvdread for ifo files and block reading. * It depends on: libdvdread for ifo files and block reading.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2003 VideoLAN * 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: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -129,6 +129,7 @@ int E_(InitDVD) ( vlc_object_t *p_this ) ...@@ -129,6 +129,7 @@ int E_(InitDVD) ( vlc_object_t *p_this )
} }
p_input->pf_demux = DvdReadDemux; p_input->pf_demux = DvdReadDemux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL; p_input->pf_rewind = NULL;
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* slp.c: SLP access plugin * slp.c: SLP access plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * 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: Loc Minier <lool@videolan.org> * Authors: Loc Minier <lool@videolan.org>
* *
...@@ -415,6 +415,7 @@ static int Init ( vlc_object_t *p_this ) ...@@ -415,6 +415,7 @@ static int Init ( vlc_object_t *p_this )
} }
p_input->pf_demux = Demux; p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL; p_input->pf_rewind = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* v4l.c : Video4Linux input module for vlc * v4l.c : Video4Linux input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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 <fenrir@via.ecp.fr> * Author: Laurent Aimar <fenrir@via.ecp.fr>
* Paul Forgey <paulf at aphrodite dot com> * Paul Forgey <paulf at aphrodite dot com>
...@@ -1399,6 +1399,7 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -1399,6 +1399,7 @@ static int DemuxOpen( vlc_object_t *p_this )
} }
p_input->pf_demux = Demux; p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment