gst/mpegaudioparse/gstmpegaudioparse.c: Use gst_guint64_to_gdouble for conversion

Original commit message from CVS:
* gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos):
Use gst_guint64_to_gdouble for conversion
* win32/vs6/libgstasfdemux.dsp:
* win32/vs6/libgstdvdsub.dsp:
* win32/vs6/libgstrealmedia.dsp:
Update project dependencies and add new source files

diff --git a/ChangeLog b/ChangeLog
index b138ec9a1c98fa7b2ee8369271b46d512cf9498e..135c0627b20d96c4ece919277c6aade26cdc5f9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-07  Sebastien Moutte  <sebastien@moutte.net>
+
+       * gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos):
+       Use gst_guint64_to_gdouble for conversion
+       * win32/vs6/libgstasfdemux.dsp:
+       * win32/vs6/libgstdvdsub.dsp:
+       * win32/vs6/libgstrealmedia.dsp:
+       Update project dependencies and add new source files
+
 2008-02-04  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
        * ext/mpeg2dec/gstmpeg2dec.c:

diff --git a/common b/common
index 3c5473161ce19a3530bad279b842d542895b1500..8b37d7ee833fab1d25b484d8574df3dae231b5f2 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3c5473161ce19a3530bad279b842d542895b1500
+Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2

diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index b441fb0c2dfc33f8f259c6119adbc73eda06b9cb..99ffb59d8e0092fb81078716e791804a4c6b2f2f 100644 (file)
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -1393,7 +1393,7 @@ mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts,
       fb = total_bytes;
     }
 
-    *bytepos = fa + ((fb - fa) / (b - a)) * (ts - a);
+    *bytepos = fa + ((fb - fa) / (b - a)) * (gst_guint64_to_gdouble (ts) - a);
 
     return TRUE;
   }

diff --git a/win32/vs6/libgstasfdemux.dsp b/win32/vs6/libgstasfdemux.dsp
index 268c806f1eeddd4dfd4ef416e678c92d01b32cd2..e3559b154552e8371081a28e1d9dd1f778435980 100644 (file)
--- a/win32/vs6/libgstasfdemux.dsp
+++ b/win32/vs6/libgstasfdemux.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"\r
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"\r
 # Begin Special Build Tool\r
 TargetPath=.\Release\libgstasfdemux.dll\r
 SOURCE="$(InputPath)"\r
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"\r
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"\r
 # Begin Special Build Tool\r
 TargetPath=.\Debug\libgstasfdemux.dll\r
 SOURCE="$(InputPath)"\r
@@ -118,6 +118,10 @@ SOURCE=..\..\gst\asfdemux\gstasf.c
 \r
 SOURCE=..\..\gst\asfdemux\gstasfdemux.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\asfdemux\gstrtspwms.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/win32/vs6/libgstdvdsub.dsp b/win32/vs6/libgstdvdsub.dsp
index d444ca6f86ace644366a3f381bc375cd64ba23a9..26d9de1627d6d51e56012794ac2a7bfbbc94d457 100644 (file)
--- a/win32/vs6/libgstdvdsub.dsp
+++ b/win32/vs6/libgstdvdsub.dsp
@@ -106,6 +106,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
 \r
 SOURCE=..\..\gst\dvdsub\gstdvdsubdec.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\dvdsub\gstdvdsubparse.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/win32/vs6/libgstrealmedia.dsp b/win32/vs6/libgstrealmedia.dsp
index 4453e30228f38c1d79e1a05cd3b516a061132ad9..7138d83881988cabc4ddc62a77abfb87f15440b8 100644 (file)
--- a/win32/vs6/libgstrealmedia.dsp
+++ b/win32/vs6/libgstrealmedia.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"\r
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"\r
 # Begin Special Build Tool\r
 TargetPath=.\Release\libgstrealmedia.dll\r
 SOURCE="$(InputPath)"\r
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"\r
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"\r
 # Begin Special Build Tool\r
 TargetPath=.\Debug\libgstrealmedia.dll\r
 SOURCE="$(InputPath)"\r
@@ -104,6 +104,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
+SOURCE=..\..\gst\realmedia\asmrules.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\gst\realmedia\rademux.c\r
 # End Source File\r
 # Begin Source File\r
@@ -112,12 +116,24 @@ SOURCE=..\..\gst\realmedia\rdtdepay.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\gst\realmedia\rdtmanager.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\realmedia\realhash.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\gst\realmedia\rmdemux.c\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\gst\realmedia\rmutils.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\gst\realmedia\rtspreal.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r