gst/avi/gstavimux.c: Comment a #if 0 in caps template definition as VS6 seems to...

Original commit message from CVS:
* gst/avi/gstavimux.c:
Comment a #if 0 in caps template definition as VS6 seems to
do not support it.
* gst/rtsp/gstrtspsrc.c:(gst_rtspsrc_loop_udp):
Use gst_guint64_to_gdouble for conversion.
* gst/rtsp/rtspconnection.c:(rtsp_connection_send):
Move variables declaration before the first instruction.
* gst/rtsp/rtspdefs.c:(rtsp_strresult):
Don't use hstrerror for error log on G_OS_WIN32 build as it's not supported.
And don't include netdb.h for G_OS_WIN32
* gst/rtsp/sdpmessage.c:(sdp_parse_line):
This initialization SDPMedia nmedia = {.media = NULL }; is not supported
by VS6 then use an other way to initialize SDPMedia structure.
* gst/udp/gstdynudpsink.h:
* gst/udp/gstdynudpnetutils.h:
Do not include <sys/time.h> for G_OS_WIN32
* gst/udp/gstudpsrc.c:
Define socklen_t as int for G_OS_WIN32
* win/common/config.h.in:
Undef HAVE_NETINET_IN_H
* win32/vs6/gst_plugins_good.dsw:
* win32/vs6/libgstrtp.dsp:
* win32/vs6/libgstrtsp.dsp:
* win32/vs6/libgstautogen.dsp:
* win32/vs6/libgstaudiofx.dsp:
* win32/vs6/libgstudp.dsp:
Add and update project files.
* win32/common/gstudp-enumtypes.c:
* win32/common/gstudp-enumtypes.h:
Add a copy of udp enumtypes to win32/common as in core
and base.

diff --git a/ChangeLog b/ChangeLog
index 5be1dad..e9b2614 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2007-02-11  Sébastien Moutte  <sebastien@moutte.net>
+
+       * gst/avi/gstavimux.c:
+         Comment a #if 0 in caps template definition as VS6 seems to 
+       do not support it.
+       * gst/rtsp/gstrtspsrc.c:(gst_rtspsrc_loop_udp):
+         Use gst_guint64_to_gdouble for conversion.
+       * gst/rtsp/rtspconnection.c:(rtsp_connection_send):
+         Move variables declaration before the first instruction.
+       * gst/rtsp/rtspdefs.c:(rtsp_strresult):
+         Don't use hstrerror for error log on G_OS_WIN32 build as it's not supported.
+         And don't include netdb.h for G_OS_WIN32
+       * gst/rtsp/sdpmessage.c:(sdp_parse_line):
+         This initialization SDPMedia nmedia = {.media = NULL }; is not supported
+         by VS6 then use an other way to initialize SDPMedia structure.
+       * gst/udp/gstdynudpsink.h:
+       * gst/udp/gstdynudpnetutils.h:
+         Do not include <sys/time.h> for G_OS_WIN32
+       * gst/udp/gstudpsrc.c:
+         Define socklen_t as int for G_OS_WIN32
+       * win/common/config.h.in:
+         Undef HAVE_NETINET_IN_H
+       * win32/vs6/gst_plugins_good.dsw:
+       * win32/vs6/libgstrtp.dsp:
+       * win32/vs6/libgstrtsp.dsp:
+       * win32/vs6/libgstautogen.dsp:
+       * win32/vs6/libgstaudiofx.dsp:
+       * win32/vs6/libgstudp.dsp:
+         Add and update project files.
+       * win32/common/gstudp-enumtypes.c:
+       * win32/common/gstudp-enumtypes.h:
+         Add a copy of udp enumtypes to win32/common as in core 
+         and base.
+       
 2007-02-11  Stefan Kost  <ensonic@users.sf.net>
 
        * configure.ac:

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index fddb629..84dc51a 100644 (file)
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -171,10 +171,10 @@ static GstStaticPadTemplate audio_sink_factory =
         "mpegversion = (int) 1, "
         "layer = (int) [ 1, 3 ], "
         "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; "
-#if 0
+/*#if 0 VC6 doesn't support #if here ...
         "audio/x-vorbis, "
         "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; "
-#endif
+#endif*/
         "audio/x-ac3, "
         "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]")
     );

diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index fc35f63..6870c2f 100644 (file)
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -1425,7 +1425,7 @@ gst_rtspsrc_loop_udp (GstRTSPSrc * src)
   GST_ELEMENT_WARNING (src, RESOURCE, READ, (NULL),
       ("Could not receive any UDP packets for %.4f seconds, maybe your "
           "firewall is blocking it. Retrying using a TCP connection.",
-          (gdouble) src->timeout / 1000000));
+          gst_guint64_to_gdouble (src->timeout / 1000000)));
   /* we can try only TCP now */
   src->cur_protocols = RTSP_LOWER_TRANS_TCP;
 

diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c
index 6945406..1fb26bf 100644 (file)
--- a/gst/rtsp/rtspconnection.c
+++ b/gst/rtsp/rtspconnection.c
@@ -238,12 +238,16 @@ rtsp_connection_send (RTSPConnection * conn, RTSPMessage * message)
   gint towrite;
   gchar *data;
 
+#ifdef G_OS_WIN32
+  WSADATA w;
+  int error;
+#endif
+
   g_return_val_if_fail (conn != NULL, RTSP_EINVAL);
   g_return_val_if_fail (message != NULL, RTSP_EINVAL);
 
 #ifdef G_OS_WIN32
-  WSADATA w;
-  int error = WSAStartup (0x0202, &w);
+  error = WSAStartup (0x0202, &w);
 
   if (error)
     goto startup_error;

diff --git a/gst/rtsp/rtspdefs.c b/gst/rtsp/rtspdefs.c
index 6c96e1f..413470e 100644 (file)
--- a/gst/rtsp/rtspdefs.c
+++ b/gst/rtsp/rtspdefs.c
@@ -44,10 +44,12 @@
 
 extern int h_errno;
 
-#include <netdb.h>
-
 #include "rtspdefs.h"
 
+#ifndef G_OS_WIN32
+#include <netdb.h>
+#endif
+
 static const gchar *rtsp_results[] = {
   "OK",
   /* errors */
@@ -217,7 +219,13 @@ rtsp_strresult (RTSPResult result)
       res = g_strdup_printf (rtsp_results[idx], g_strerror (errno));
       break;
     case -RTSP_ENET:
+#ifndef G_OS_WIN32
       res = g_strdup_printf (rtsp_results[idx], hstrerror (h_errno));
+#else
+      res =
+          g_strdup
+          ("not supported on win32, implement me in a different way ??");
+#endif
       break;
     case -RTSP_ELAST:
       res = g_strdup_printf (rtsp_results[idx], result);

diff --git a/gst/rtsp/sdpmessage.c b/gst/rtsp/sdpmessage.c
index e7d2d7e..1277bdc 100644 (file)
--- a/gst/rtsp/sdpmessage.c
+++ b/gst/rtsp/sdpmessage.c
@@ -582,7 +582,9 @@ sdp_parse_line (SDPContext * c, gchar type, gchar * buffer)
     case 'm':
     {
       gchar *slash;
-      SDPMedia nmedia = {.media = NULL };
+      SDPMedia nmedia;
+
+      nmedia.media = NULL;
 
       c->state = SDP_MEDIA;
       sdp_media_init (&nmedia);

diff --git a/gst/udp/gstdynudpsink.h b/gst/udp/gstdynudpsink.h
index e57a0ef..0c300c9 100644 (file)
--- a/gst/udp/gstdynudpsink.h
+++ b/gst/udp/gstdynudpsink.h
@@ -30,7 +30,9 @@ G_BEGIN_DECLS
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#ifndef G_OS_WIN32
 #include <sys/time.h>
+#endif
 #include <sys/types.h>
 
 #include "gstudpnetutils.h"

diff --git a/gst/udp/gstudpnetutils.h b/gst/udp/gstudpnetutils.h
index ab4fd9d..86c9015 100644 (file)
--- a/gst/udp/gstudpnetutils.h
+++ b/gst/udp/gstudpnetutils.h
@@ -21,7 +21,6 @@
 #ifndef __GST_UDP_NET_UTILS_H__
 #define __GST_UDP_NET_UTILS_H__
 
-#include <sys/time.h>
 #include <sys/types.h>
 
 /* Needed for G_OS_XXXX */
@@ -36,6 +35,7 @@
 #include <gst/gstinfo.h>
 
 #else
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <sys/socket.h>

diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index b3e4b42..f2a59e3 100644 (file)
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -111,6 +111,9 @@
 #include <stdlib.h>
 
 #include <gst/netbuffer/gstnetbuffer.h>
+#ifdef G_OS_WIN32
+typedef int socklen_t;
+#endif
 
 #ifdef HAVE_FIONREAD_IN_SYS_FILIO
 #include <sys/filio.h>

diff --git a/win32/common/config.h b/win32/common/config.h
index 506adb5..64c00cb 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -163,7 +163,7 @@
 #undef HAVE_MMAP
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
+#undef HAVE_NETINET_IN_H
 
 /* support for features: osssrc osssink */
 #define HAVE_OSS 

diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index 28993c9..554197e 100644 (file)
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -163,7 +163,7 @@
 #undef HAVE_MMAP
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
+#undef HAVE_NETINET_IN_H
 
 /* support for features: osssrc osssink */
 #define HAVE_OSS 

diff --git a/win32/common/gstudp-enumtypes.c b/win32/common/gstudp-enumtypes.c
new file mode 100644 (file)
index 0000000..46f19db
--- /dev/null
+++ b/win32/common/gstudp-enumtypes.c
@@ -0,0 +1,25 @@
+
+/* Generated data (by glib-mkenums) */
+
+#include <gstudp.h>
+
+/* enumerations from "gstudp.h" */
+GType
+gst_udp_control_get_type (void)
+{
+  static GType etype = 0;
+
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      {CONTROL_ZERO, "CONTROL_ZERO", "zero"},
+      {CONTROL_NONE, "CONTROL_NONE", "none"},
+      {CONTROL_UDP, "CONTROL_UDP", "udp"},
+      {CONTROL_TCP, "CONTROL_TCP", "tcp"},
+      {0, NULL, NULL}
+    };
+    etype = g_enum_register_static ("GstUDPControl", values);
+  }
+  return etype;
+}
+
+/* Generated data ends here */

diff --git a/win32/common/gstudp-enumtypes.h b/win32/common/gstudp-enumtypes.h
new file mode 100644 (file)
index 0000000..6b0697a
--- /dev/null
+++ b/win32/common/gstudp-enumtypes.h
@@ -0,0 +1,19 @@
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef __GST_UDP_ENUM_TYPES_H__
+#define __GST_UDP_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "gstudp.h" */
+GType gst_udp_control_get_type (void);
+#define GST_TYPE_UDP_CONTROL (gst_udp_control_get_type())
+G_END_DECLS
+
+#endif /* __GST_UDP_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+

diff --git a/win32/vs6/autogen.dsp b/win32/vs6/autogen.dsp
new file mode 100644 (file)
index 0000000..dcb28a5
--- /dev/null
+++ b/win32/vs6/autogen.dsp
@@ -0,0 +1,149 @@
+# Microsoft Developer Studio Project File - Name="autogen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Generic Project" 0x010a
+
+CFG=autogen - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "autogen.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "autogen.mak" CFG="autogen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "autogen - Win32 Release" (based on "Win32 (x86) Generic Project")
+!MESSAGE "autogen - Win32 Debug" (based on "Win32 (x86) Generic Project")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+MTL=midl.exe
+
+!IF  "$(CFG)" == "autogen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "autogen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "autogen - Win32 Release"
+# Name "autogen - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\gst\playback\gstplay-marshal.list"
+
+!IF  "$(CFG)" == "autogen - Win32 Release"
+
+# Begin Custom Build
+InputPath="..\..\gst\playback\gstplay-marshal.list"
+
+BuildCmds= \
+       echo #include "glib-object.h" > gstudp-marshal.c.tmp \
+       echo #include "gstudp-marshal.h" >> gstudp-marshal.c.tmp \
+       glib-genmarshal --body --prefix=gst_udp_marshal ..\..\gst\udp\gstudp-marshal.list >> gstudp-marshal.c.tmp \
+       move gstudp-marshal.c.tmp ..\..\gst\udp\gstudp-marshal.c \
+       echo #include "gst/gstconfig.h" > gstudp-marshal.h.tmp \
+       glib-genmarshal --header --prefix=gst_udp_marshal ..\..\gst\udp\gstudp-marshal.list >> gstudp-marshal.h.tmp \
+       move gstudp-marshal.h.tmp ..\..\gst\udp\gstudp-marshal.h \
+       
+
+"..\..\gst\udp\gstudp-marshal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\udp\gstudp-marshal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "autogen - Win32 Debug"
+
+# Begin Custom Build
+InputPath="..\..\gst\playback\gstplay-marshal.list"
+
+BuildCmds= \
+       echo #include "glib-object.h" > gstudp-marshal.c.tmp \
+       echo #include "gstudp-marshal.h" >> gstudp-marshal.c.tmp \
+       glib-genmarshal --body --prefix=gst_udp_marshal ..\..\gst\udp\gstudp-marshal.list >> gstudp-marshal.c.tmp \
+       move gstudp-marshal.c.tmp ..\..\gst\udp\gstudp-marshal.c \
+       echo #include "gst/gstconfig.h" > gstudp-marshal.h.tmp \
+       glib-genmarshal --header --prefix=gst_udp_marshal ..\..\gst\udp\gstudp-marshal.list >> gstudp-marshal.h.tmp \
+       move gstudp-marshal.h.tmp ..\..\gst\udp\gstudp-marshal.h \
+       
+
+"..\..\gst\udp\gstudp-marshal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\udp\gstudp-marshal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE="..\common\gstudp-enumtypes.c"
+
+!IF  "$(CFG)" == "autogen - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\common\gstudp-enumtypes.c
+
+BuildCmds= \
+       copy /y ..\common\gstudp-enumtypes.c ..\..\gst\udp\gstudp-enumtypes.c \
+       copy /y ..\common\gstudp-enumtypes.h ..\..\gst\udp\gstudp-enumtypes.h \
+       
+
+"..\..\gst\udp\gstudp-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\udp\gstudp-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "autogen - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\common\gstudp-enumtypes.c
+
+"..\..\gst\udp\gstudp-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy /y ..\common\gstudp-enumtypes.c ..\..\gst\udp\gstudp-enumtypes.c 
+       copy /y ..\common\gstudp-enumtypes.h ..\..\gst\udp\gstudp-enumtypes.h 
+       
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project

diff --git a/win32/vs6/gst_plugins_good.dsw b/win32/vs6/gst_plugins_good.dsw
index cf07cb3..9cfe70c 100644 (file)
--- a/win32/vs6/gst_plugins_good.dsw
+++ b/win32/vs6/gst_plugins_good.dsw
@@ -51,6 +51,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libgstaudiofx"=".\libgstaudiofx.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libgstauparse"=".\libgstauparse.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -99,6 +111,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libgstdebug"=".\libgstdebug.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libgstdvdemux"=".\libgstdvdemux.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libgsteffectv"=".\libgsteffectv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -303,6 +339,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libgstudp"=".\libgstudp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name autogen
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libgstvideobalance"=".\libgstvideobalance.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -375,6 +426,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "autogen"=".\autogen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>

diff --git a/win32/vs6/libgstaudiofx.dsp b/win32/vs6/libgstaudiofx.dsp
new file mode 100644 (file)
index 0000000..7b50fe8
--- /dev/null
+++ b/win32/vs6/libgstaudiofx.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="libgstaudiofx" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libgstaudiofx - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libgstaudiofx.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libgstaudiofx.mak" CFG="libgstaudiofx - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libgstaudiofx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libgstaudiofx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libgstaudiofx - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTAUDIOFX_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTAUDIOFX_EXPORTS" /D "HAVE_CONFIG_H" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# 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
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib libgstaudio-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
+# Begin Special Build Tool
+TargetPath=.\Release\libgstaudiofx.dll
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libgstaudiofx - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTAUDIOFX_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTAUDIOFX_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# 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
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib libgstaudio-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"
+# Begin Special Build Tool
+TargetPath=.\Debug\libgstaudiofx.dll
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libgstaudiofx - Win32 Release"
+# Name "libgstaudiofx - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\gst\audiofx\audioamplify.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\audiofx\audiofx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\audiofx\audioinvert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\audiofx\audiopanorama.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

diff --git a/win32/vs6/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp
index 765b1c9..8ce9f1a 100644 (file)
--- a/win32/vs6/libgstrtp.dsp
+++ b/win32/vs6/libgstrtp.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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
-# 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"
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib libgsttag-0.10.lib Ws2_32.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
 # Begin Special Build Tool
 TargetPath=.\Release\libgstrtp.dll
 SOURCE="$(InputPath)"
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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
-# 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"
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib libgsttag-0.10.lib Ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"
 # Begin Special Build Tool
 TargetPath=.\Debug\libgstrtp.dll
 SOURCE="$(InputPath)"
@@ -112,6 +112,10 @@ SOURCE=..\..\gst\rtp\gstrtp.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\rtp\gstrtpac3depay.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\rtp\gstrtpamrdepay.c
 # End Source File
 # Begin Source File
@@ -144,6 +148,18 @@ SOURCE=..\..\gst\rtp\gstrtph263ppay.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\rtp\gstrtph264depay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpilbcdepay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpilbcpay.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\rtp\gstrtpL16depay.c
 # End Source File
 # Begin Source File
@@ -152,6 +168,14 @@ SOURCE=..\..\gst\rtp\gstrtpL16pay.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\rtp\gstrtpmp2tdepay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpmp4gdepay.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\rtp\gstrtpmp4gpay.c
 # End Source File
 # Begin Source File
@@ -172,6 +196,10 @@ SOURCE=..\..\gst\rtp\gstrtpmpapay.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\rtp\gstrtpmpvdepay.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\rtp\gstrtppcmadepay.c
 # End Source File
 # Begin Source File
@@ -194,6 +222,26 @@ SOURCE=..\..\gst\rtp\gstrtpspeexdepay.c
 
 SOURCE=..\..\gst\rtp\gstrtpspeexpay.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpsv3vdepay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtptheoradepay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtptheorapay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpvorbisdepay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\rtp\gstrtpvorbispay.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -236,14 +284,6 @@ SOURCE=..\..\gst\rtp\gstrtph263ppay.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\rtp\gstrtpL16depay.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gst\rtp\gstrtpL16pay.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\rtp\gstrtpmp4gpay.h
 # End Source File
 # Begin Source File

diff --git a/win32/vs6/libgstrtsp.dsp b/win32/vs6/libgstrtsp.dsp
index c484234..090ae9b 100644 (file)
--- a/win32/vs6/libgstrtsp.dsp
+++ b/win32/vs6/libgstrtsp.dsp
@@ -124,6 +124,10 @@ SOURCE=..\..\gst\rtsp\rtspdefs.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\rtsp\rtspextwms.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\rtsp\rtspmessage.c
 # End Source File
 # Begin Source File

diff --git a/win32/vs6/libgstudp.dsp b/win32/vs6/libgstudp.dsp
new file mode 100644 (file)
index 0000000..76c412b
--- /dev/null
+++ b/win32/vs6/libgstudp.dsp
@@ -0,0 +1,179 @@
+# Microsoft Developer Studio Project File - Name="libgstudp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libgstudp - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libgstudp.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libgstudp.mak" CFG="libgstudp - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libgstudp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libgstudp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libgstudp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUDP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gst-plugins-good/gst/udp" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUDP_EXPORTS" /D "HAVE_CONFIG_H" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# 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
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstnetbuffer-0.10.lib Ws2_32.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
+# Begin Special Build Tool
+TargetPath=.\Release\libgstudp.dll
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libgstudp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUDP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gst-plugins-good/gst/udp" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUDP_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# 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
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstnetbuffer-0.10.lib Ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"
+# Begin Special Build Tool
+TargetPath=.\Debug\libgstudp.dll
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libgstudp - Win32 Release"
+# Name "libgstudp - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstdynudpsink.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstmultiudpsink.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\gst\udp\gstudp-enumtypes.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\gst\udp\gstudp-marshal.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpnetutils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpsink.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpsrc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstdynudpsink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstmultiudpsink.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\gst\udp\gstudp-enumtypes.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\gst\udp\gstudp-marshal.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpnetutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpsink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gst\udp\gstudpsrc.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project