diff --git a/ChangeLog b/ChangeLog index 3be8e44f9b..52a6bde409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2007-02-10 Sébastien Moutte + + * gst-libs/gst/rtp/gstbasertpaudiopayload.c:(gst_base_rtp_audio_payload_handle_frame_based_buffer): + Use gst_gdouble_to_guint64 for conversions. + * win32/common/config.h.in: + Add a define for GST_INSTALL_PLUGINS_HELPER + * win32/common/libgstaudio.def: + * win32/common/libgstcdda.def: + * win32/common/libgstnetbuffer.def: + * win32/common/libgstrtp.def: + * win32/common/libgutils.def: + Add new exported functions. + * win32/vs6/gst_plugins_base.dsw: + * win32/vs6/libgstdecodebin.dsp: + * win32/vs6/libgstnetbuffer.dsp: + * win32/vs6/libgstplaybin.dsp: + * win32/vs6/libgstrtp.dsp: + * win32/vs6/libgstvorbis.dsp: + * win32/vs6/libgstcdda.dsp: + * win32/vs6/libgstgdp.dsp: + * win32/vs6/libgstutils.dsp: + Update and add new project files. + 2007-02-10 Tim-Philipp Müller * gst/subparse/gstsubparse.c: (subrip_remove_unhandled_tag), diff --git a/gst-libs/gst/rtp/gstbasertpaudiopayload.c b/gst-libs/gst/rtp/gstbasertpaudiopayload.c index 9408dbfd37..8b349fa5d4 100644 --- a/gst-libs/gst/rtp/gstbasertpaudiopayload.c +++ b/gst-libs/gst/rtp/gstbasertpaudiopayload.c @@ -341,7 +341,7 @@ gst_base_rtp_audio_payload_handle_frame_based_buffer (GstBaseRTPPayload * ts_inc = (payload_len * frame_duration) / frame_size; ts_inc = ts_inc * GST_MSECOND; - basertpaudiopayload->base_ts += ts_inc; + basertpaudiopayload->base_ts += gst_gdouble_to_guint64 (ts_inc); available -= payload_len; data += payload_len; @@ -437,7 +437,7 @@ gst_base_rtp_audio_payload_handle_sample_based_buffer (GstBaseRTPPayload * basertpaudiopayload->base_ts += /* payload_len (bytes) * nsecs/sec / datarate (bytes*sec) */ - num / datarate * GST_SECOND; + gst_gdouble_to_guint64 (num / datarate * GST_SECOND); GST_DEBUG_OBJECT (basertpaudiopayload, "New ts is %" GST_TIME_FORMAT, GST_TIME_ARGS (basertpaudiopayload->base_ts)); diff --git a/win32/common/config.h.in b/win32/common/config.h.in index 7f1019aa82..de32ea36dc 100644 --- a/win32/common/config.h.in +++ b/win32/common/config.h.in @@ -255,3 +255,5 @@ #ifndef __cplusplus #undef inline #endif + +#define GST_INSTALL_PLUGINS_HELPER "@GST_INSTALL_PLUGINS_HELPER@" diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 1542312bf0..ae5a7bdb90 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -1,11 +1,14 @@ EXPORTS - gst_audio_channel_position_get_type gst_audio_duration_from_pad_buffer + gst_audio_channel_position_get_type gst_audio_get_channel_positions gst_audio_is_buffer_framed + gst_audio_filter_class_add_pad_templates + gst_audio_filter_get_type gst_audio_set_channel_positions gst_audio_sink_get_type gst_audio_src_get_type gst_base_audio_sink_get_type + diff --git a/win32/common/libgstcdda.def b/win32/common/libgstcdda.def new file mode 100644 index 0000000000..6212c1bddb --- /dev/null +++ b/win32/common/libgstcdda.def @@ -0,0 +1,3 @@ +EXPORTS + gst_cdda_base_src_get_type + gst_cdda_base_src_add_track \ No newline at end of file diff --git a/win32/common/libgstnetbuffer.def b/win32/common/libgstnetbuffer.def new file mode 100644 index 0000000000..2d16984bfb --- /dev/null +++ b/win32/common/libgstnetbuffer.def @@ -0,0 +1,6 @@ +EXPORTS + gst_netaddress_get_ip4_address + gst_netaddress_set_ip4_address + gst_netbuffer_get_type + gst_netbuffer_new + \ No newline at end of file diff --git a/win32/common/libgstrtp.def b/win32/common/libgstrtp.def new file mode 100644 index 0000000000..ab700a3412 --- /dev/null +++ b/win32/common/libgstrtp.def @@ -0,0 +1,29 @@ +EXPORTS + gst_basertppayload_is_filled + gst_basertppayload_get_type + gst_basertppayload_push + gst_basertppayload_set_options + gst_basertppayload_set_outcaps + gst_base_rtp_audio_payload_get_type + gst_base_rtp_audio_payload_set_frame_based + gst_base_rtp_audio_payload_set_frame_options + gst_base_rtp_depayload_get_type + gst_base_rtp_depayload_push + gst_base_rtp_depayload_push_ts + gst_rtp_buffer_calc_header_len + gst_rtp_buffer_calc_packet_len + gst_rtp_buffer_calc_payload_len + gst_rtp_buffer_get_marker + gst_rtp_buffer_get_payload + gst_rtp_buffer_get_payload_buffer + gst_rtp_buffer_get_payload_len + gst_rtp_buffer_get_payload_subbuffer + gst_rtp_buffer_get_payload_type + gst_rtp_buffer_get_seq + gst_rtp_buffer_get_timestamp + gst_rtp_buffer_new_allocate + gst_rtp_buffer_new_allocate_len + gst_rtp_buffer_new_take_data + gst_rtp_buffer_set_marker + gst_rtp_buffer_set_payload_type + gst_rtp_buffer_validate diff --git a/win32/common/libgstutils.def b/win32/common/libgstutils.def new file mode 100644 index 0000000000..0d2bd397f9 --- /dev/null +++ b/win32/common/libgstutils.def @@ -0,0 +1,8 @@ +EXPORTS + gst_base_utils_init + gst_base_utils_get_source_description + gst_is_missing_plugin_message + gst_missing_decoder_message_new + gst_missing_element_message_new + gst_missing_plugin_message_get_installer_detail + gst_missing_uri_source_message_new \ No newline at end of file diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw index e290cc84fb..5006628c22 100644 --- a/win32/vs6/gst_plugins_base.dsw +++ b/win32/vs6/gst_plugins_base.dsw @@ -90,6 +90,21 @@ Package=<4> ############################################################################### +Project: "libgstcdda"=".\libgstcdda.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libgsttag + End Project Dependency +}}} + +############################################################################### + Project: "libgstdecodebin"=".\libgstdecodebin.dsp" - Package Owner=<4> Package=<5> @@ -101,6 +116,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name grammar End Project Dependency + Begin Project Dependency + Project_Dep_Name libgstutils + End Project Dependency }}} ############################################################################### @@ -117,6 +135,18 @@ Package=<4> ############################################################################### +Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgstinterfaces"=".\libgstinterfaces.dsp" - Package Owner=<4> Package=<5> @@ -170,6 +200,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name grammar End Project Dependency + Begin Project Dependency + Project_Dep_Name libgstutils + End Project Dependency }}} ############################################################################### @@ -264,6 +297,18 @@ Package=<4> ############################################################################### +Project: "libgstutils"=".\libgstutils.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgstvideo"=".\libgstvideo.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/vs6/libgstcdda.dsp b/win32/vs6/libgstcdda.dsp new file mode 100644 index 0000000000..f2cd05529b --- /dev/null +++ b/win32/vs6/libgstcdda.dsp @@ -0,0 +1,143 @@ +# Microsoft Developer Studio Project File - Name="libgstcdda" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgstcdda - 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 "libgstcdda.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 "libgstcdda.mak" CFG="libgstcdda - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgstcdda - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstcdda - 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)" == "libgstcdda - 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 "LIBGSTCDDA_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCDDA_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 libgsttag-0.10.lib /nologo /dll /machine:I386 /out:"Release/libgstcdda-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# Begin Special Build Tool +TargetPath=.\Release\libgstcdda-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstcdda - 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 "LIBGSTCDDA_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCDDA_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 libgsttag-0.10.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstcdda-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# Begin Special Build Tool +TargetPath=.\Debug\libgstcdda-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgstcdda - Win32 Release" +# Name "libgstcdda - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\base64.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\gstcddabasesrc.c" +# End Source File +# Begin Source File + +SOURCE=..\common\libgstcdda.def +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\sha1.c" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\base64.h" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\gstcddabasesrc.h" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\cdda\sha1.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 diff --git a/win32/vs6/libgstdecodebin.dsp b/win32/vs6/libgstdecodebin.dsp index 24f569daeb..ef727cd47c 100644 --- a/win32/vs6/libgstdecodebin.dsp +++ b/win32/vs6/libgstdecodebin.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" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstutils-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" # Begin Special Build Tool TargetPath=.\Release\libgstdecodebin.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" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstutils-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" # Begin Special Build Tool TargetPath=.\Debug\libgstdecodebin.dll SOURCE="$(InputPath)" diff --git a/win32/vs6/libgstgdp.dsp b/win32/vs6/libgstgdp.dsp new file mode 100644 index 0000000000..79a6d206f7 --- /dev/null +++ b/win32/vs6/libgstgdp.dsp @@ -0,0 +1,127 @@ +# Microsoft Developer Studio Project File - Name="libgstgdp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgstgdp - 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 "libgstgdp.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 "libgstgdp.mak" CFG="libgstgdp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgstgdp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstgdp - 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)" == "libgstgdp - 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 "LIBGSTGDP_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTGDP_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 libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstdataprotocol-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# Begin Special Build Tool +TargetPath=.\Release\libgstgdp.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstgdp - 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 "LIBGSTGDP_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTGDP_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 libgstcontroller-0.10.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstdataprotocol-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# Begin Special Build Tool +TargetPath=.\Debug\libgstgdp.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgstgdp - Win32 Release" +# Name "libgstgdp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\gst\gdp\gstgdp.c +# End Source File +# Begin Source File + +SOURCE=..\..\gst\gdp\gstgdpdepay.c +# End Source File +# Begin Source File + +SOURCE=..\..\gst\gdp\gstgdppay.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/libgstnetbuffer.dsp b/win32/vs6/libgstnetbuffer.dsp index 23bc75ba78..6fddbcecc5 100644 --- a/win32/vs6/libgstnetbuffer.dsp +++ b/win32/vs6/libgstnetbuffer.dsp @@ -106,6 +106,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin SOURCE="..\..\gst-libs\gst\netbuffer\gstnetbuffer.c" # End Source File +# Begin Source File + +SOURCE=..\common\libgstnetbuffer.def +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstplaybin.dsp b/win32/vs6/libgstplaybin.dsp index f8f3ba88e1..ca86e3402f 100644 --- a/win32/vs6/libgstplaybin.dsp +++ b/win32/vs6/libgstplaybin.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" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstutils-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" # Begin Special Build Tool TargetPath=.\Release\libgstplaybin.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" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstutils-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" # Begin Special Build Tool TargetPath=.\Debug\libgstplaybin.dll SOURCE="$(InputPath)" diff --git a/win32/vs6/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp index 4bf384e264..7b3fdc4d4a 100644 --- a/win32/vs6/libgstrtp.dsp +++ b/win32/vs6/libgstrtp.dsp @@ -104,6 +104,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE="..\..\gst-libs\gst\rtp\gstbasertpaudiopayload.c" +# End Source File +# Begin Source File + SOURCE="..\..\gst-libs\gst\rtp\gstbasertpdepayload.c" # End Source File # Begin Source File @@ -114,6 +118,10 @@ SOURCE="..\..\gst-libs\gst\rtp\gstbasertppayload.c" SOURCE="..\..\gst-libs\gst\rtp\gstrtpbuffer.c" # End Source File +# Begin Source File + +SOURCE=..\common\libgstrtp.def +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstutils.dsp b/win32/vs6/libgstutils.dsp new file mode 100644 index 0000000000..b6b20625e7 --- /dev/null +++ b/win32/vs6/libgstutils.dsp @@ -0,0 +1,135 @@ +# Microsoft Developer Studio Project File - Name="libgstutils" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgstutils - 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 "libgstutils.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 "libgstutils.mak" CFG="libgstutils - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgstutils - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgstutils - 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)" == "libgstutils - 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 "LIBGSTUTILS_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUTILS_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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release/libgstutils-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" +# Begin Special Build Tool +TargetPath=.\Release\libgstutils-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgstutils - 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 "LIBGSTUTILS_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTUTILS_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 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstutils-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" +# Begin Special Build Tool +TargetPath=.\Debug\libgstutils-0.10.dll +SOURCE="$(InputPath)" +PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgstutils - Win32 Release" +# Name "libgstutils - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\..\gst-libs\gst\utils\base-utils.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\utils\descriptions.c" +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\utils\install-plugins.c" +# End Source File +# Begin Source File + +SOURCE=..\common\libgstutils.def +# End Source File +# Begin Source File + +SOURCE="..\..\gst-libs\gst\utils\missing-plugins.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