* modules/access/http.c,modules/access/mmsh,modules/demux/livedotcom.cpp: Disable...

algorithm for http/mms/rtsp by default for now since our algo was designed for local network
streaming of MPEG over UDP in mind and doesn't work well in other cases.
You can still use the --clock-synchro config option to override this.
Hopefully this commit will be reverted once the clock synchro has been re-written.

diff --git a/modules/access/http.c b/modules/access/http.c
index e0900c2d15865bb091675337e586f3734c2770bf..c59fde7cbd25069b9b509f41ccf519c468fbd79d 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -384,8 +384,9 @@ static int Open( vlc_object_t *p_this )
             msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
                       p_access->psz_demux );
 
-#if 0       /* Doesn't work really well because of the pre-buffering in shoutcast
-             * servers (the buffer content will be sent as fast as possible). */
+#if 0       /* Doesn't work really well because of the pre-buffering in
+             * shoutcast servers (the buffer content will be sent as fast as
+             * possible). */
             p_sys->b_pace_control = VLC_FALSE;
 #endif
         }
@@ -705,7 +706,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_CAN_PAUSE:
         case ACCESS_CAN_CONTROL_PACE:
             pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+
+#if 0       /* Disable for now until we have a clock synchro algo
+             * which works with something else than MPEG over UDP */
             *pb_bool = p_sys->b_pace_control;
+#endif
+            *pb_bool = VLC_TRUE;
             break;
 
         /* */

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 46245b258d5ac8cf1fe5e982067654702b90f300..213c859080ceac7f70099dda1e57d91112f15798 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -180,7 +180,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_CAN_PAUSE:
         case ACCESS_CAN_CONTROL_PACE:
             pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+
+#if 0       /* Disable for now until we have a clock synchro algo
+             * which works with something else than MPEG over UDP */
             *pb_bool = VLC_FALSE;
+#endif
+            *pb_bool = VLC_TRUE;
             break;
 
         /* */

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index d9d6ddd43dfa18f5cdf04d99517ded930733ea03..9b58d7ce15ef8a85a4f88ff44ad6e54eed22ea24 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -263,7 +263,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_CAN_PAUSE:
         case ACCESS_CAN_CONTROL_PACE:
             pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+
+#if 0       /* Disable for now until we have a clock synchro algo
+             * which works with something else than MPEG over UDP */
             *pb_bool = VLC_FALSE;
+#endif
+            *pb_bool = VLC_TRUE;
             break;
 
         /* */

diff --git a/modules/demux/livedotcom.cpp b/modules/demux/livedotcom.cpp
index 7ba9169000fe110481b0689511ec091ed7f5ab5a..8ef90599145aad9d62b3a46ed542c70e8336895d 100644 (file)
--- a/modules/demux/livedotcom.cpp
+++ b/modules/demux/livedotcom.cpp
@@ -822,7 +822,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_CAN_CONTROL_PACE:
             pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+
+#if 0       /* Disable for now until we have a clock synchro algo
+             * which works with something else than MPEG over UDP */
             *pb = VLC_FALSE;
+#endif
+            *pb = VLC_TRUE;
             return VLC_SUCCESS;
 
         case DEMUX_SET_PAUSE_STATE: