From 6e2ae6f2ea83b18bf997b748f906d3ab98b19316 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Thu, 1 Apr 2004 23:19:30 +0000 Subject: [PATCH] * all: do not implement DEMUX_SET_TIME. DEMUX_SET_TIME. should be implemented _only_ when it has a high precision. --- modules/demux/a52.c | 11 +++++++---- modules/demux/aac.c | 11 +++++++---- modules/demux/dts.c | 11 +++++++---- modules/demux/flac.c | 11 +++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/modules/demux/a52.c b/modules/demux/a52.c index 73f83e3526..aef2c928f6 100644 --- a/modules/demux/a52.c +++ b/modules/demux/a52.c @@ -2,7 +2,7 @@ * a52.c : raw A/52 stream input module for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: a52.c,v 1.8 2004/03/03 20:39:51 gbazin Exp $ + * $Id$ * * Authors: Gildas Bazin * @@ -274,9 +274,12 @@ static int Demux( demux_t *p_demux ) static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; - return demux2_vaControlHelper( p_demux->s, - 0, -1, - 8*p_sys->i_mux_rate, 1, i_query, args ); + if( i_query == DEMUX_SET_TIME ) + return VLC_EGENERIC; + else + return demux2_vaControlHelper( p_demux->s, + 0, -1, + 8*p_sys->i_mux_rate, 1, i_query, args ); } /***************************************************************************** diff --git a/modules/demux/aac.c b/modules/demux/aac.c index 0e41b0d44f..3ae6bf6112 100644 --- a/modules/demux/aac.c +++ b/modules/demux/aac.c @@ -2,7 +2,7 @@ * aac.c : Raw aac Stream input module for vlc ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: aac.c,v 1.11 2004/03/03 20:39:51 gbazin Exp $ + * $Id$ * * Authors: Laurent Aimar * @@ -263,8 +263,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { /* demux_sys_t *p_sys = p_demux->p_sys; */ /* FIXME calculate the bitrate */ - return demux2_vaControlHelper( p_demux->s, - 0, -1, - 8*0, 1, i_query, args ); + if( i_query == DEMUX_SET_TIME ) + return VLC_EGENERIC; + else + return demux2_vaControlHelper( p_demux->s, + 0, -1, + 8*0, 1, i_query, args ); } diff --git a/modules/demux/dts.c b/modules/demux/dts.c index 15d0b14c71..5b9d2f2c05 100644 --- a/modules/demux/dts.c +++ b/modules/demux/dts.c @@ -2,7 +2,7 @@ * dts.c : raw DTS stream input module for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: dts.c,v 1.12 2004/03/03 20:39:51 gbazin Exp $ + * $Id$ * * Authors: Gildas Bazin * @@ -256,9 +256,12 @@ static int Demux( demux_t *p_demux ) static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; - return demux2_vaControlHelper( p_demux->s, - 0, -1, - 8*p_sys->i_mux_rate, 1, i_query, args ); + if( i_query == DEMUX_SET_TIME ) + return VLC_EGENERIC; + else + return demux2_vaControlHelper( p_demux->s, + 0, -1, + 8*p_sys->i_mux_rate, 1, i_query, args ); } /***************************************************************************** diff --git a/modules/demux/flac.c b/modules/demux/flac.c index 8bd7a1cef2..5077c5d980 100644 --- a/modules/demux/flac.c +++ b/modules/demux/flac.c @@ -2,7 +2,7 @@ * flac.c : FLAC demux module for vlc ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: flac.c,v 1.13 2004/03/03 20:39:51 gbazin Exp $ + * $Id$ * * Authors: Gildas Bazin * @@ -223,8 +223,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { /* demux_sys_t *p_sys = p_demux->p_sys; */ /* FIXME bitrate */ - return demux2_vaControlHelper( p_demux->s, - 0, -1, - 8*0, 1, i_query, args ); + if( i_query == DEMUX_SET_TIME ) + return VLC_EGENERIC; + else + return demux2_vaControlHelper( p_demux->s, + 0, -1, + 8*0, 1, i_query, args ); } -- 2.39.2