* all: do not implement DEMUX_SET_TIME. DEMUX_SET_TIME should be

 implemented _only_ when it has a high precision.

diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index 47c94ba173ae0e4928bc88aca6b69116b0b071b0..88b43e266405e9725f11da46fd79cdd27f85cf35 100644 (file)
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -365,13 +365,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi64 = 0;
             return VLC_EGENERIC;
 
-        case DEMUX_SET_TIME:
 #endif
         case DEMUX_GET_FPS:
             pf = (double*)va_arg( args, double * );
             *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
             return VLC_SUCCESS;
 
+        case DEMUX_SET_TIME:
         default:
             return VLC_EGENERIC;
     }

diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index 711d117504252a8626f59bc920bb505840b8dec1..07978cab0caefad44794c777746e92e611cf826f 100644 (file)
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -2,7 +2,7 @@
  * pva.c: PVA demuxer
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: pva.c,v 1.1 2004/01/23 17:42:10 fenrir Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -328,13 +328,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi64 = 0;
             return VLC_EGENERIC;
 
-        case DEMUX_SET_TIME:
 #endif
         case DEMUX_GET_FPS:
             pf = (double*)va_arg( args, double * );
             *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
             return VLC_SUCCESS;
 #endif
+        case DEMUX_SET_TIME:
         default:
             return VLC_EGENERIC;
     }

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 4b90b6c359e5c6d2e1b9013dc822b0c2dbf28d59..38a889f695603f620c56eaab39b5b6216d10e547 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -693,7 +693,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi64 = p_sys->i_time;
             return VLC_SUCCESS;
 
-#if 0
         case DEMUX_GET_LENGTH:
             pi64 = (int64_t*)va_arg( args, int64_t * );
             if( p_sys->i_mux_rate > 0 )
@@ -703,14 +702,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             }
             *pi64 = 0;
             return VLC_EGENERIC;
-
-        case DEMUX_SET_TIME:
 #endif
         case DEMUX_GET_FPS:
-            pf = (double*)va_arg( args, double * );
-            *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
-            return VLC_SUCCESS;
-#endif
+        case DEMUX_SET_TIME:
         default:
             return VLC_EGENERIC;
     }