From: <tp...@ke...> - 2007-10-31 22:01:13
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Wed Oct 31 2007 22:01:17 UTC Log message: Patch by: Ole André Vadla Ravnås <ole...@ta...> * gst/gsttrace.c: * libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_new): * libs/gst/net/gstnettimepacket.c: (gst_net_time_packet_send): * libs/gst/net/gstnettimeprovider.c: (gst_net_time_provider_new): Fix a couple of missing includes for MSVC2005 and a C99 issue. Also, starting with 2.14.0, GLib won't provide a pipe() macro any longer, so use _pipe() directly (#492077). * win32/common/dirent.c: (_treaddir): Add a couple of casts to make it build without warnings with MSVC. * win32/common/libgstreamer.def: Add some more symbols that need to be exported. Modified files: . : ChangeLog gst : gsttrace.c libs/gst/net : gstnetclientclock.c gstnettimepacket.c gstnettimeprovider.c win32/common : dirent.c libgstreamer.def Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3505&r2=1.3506 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsttrace.c.diff?r1=1.33&r2=1.34 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/net/gstnetclientclock.c.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/net/gstnettimepacket.c.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/net/gstnettimeprovider.c.diff?r1=1.13&r2=1.14 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/common/dirent.c.diff?r1=1.3&r2=1.4 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/common/libgstreamer.def.diff?r1=1.41&r2=1.42 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.3505 retrieving revision 1.3506 diff -u -d -r1.3505 -r1.3506 --- ChangeLog 31 Oct 2007 18:08:20 -0000 1.3505 +++ ChangeLog 31 Oct 2007 22:01:00 -0000 1.3506 @@ -1,5 +1,23 @@ 2007-10-31 Tim-Philipp Müller <tim at centricular dot net> + Patch by: Ole André Vadla Ravnås <ole...@ta...> + + * gst/gsttrace.c: + * libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_new): + * libs/gst/net/gstnettimepacket.c: (gst_net_time_packet_send): + * libs/gst/net/gstnettimeprovider.c: (gst_net_time_provider_new): + Fix a couple of missing includes for MSVC2005 and a C99 issue. Also, + starting with 2.14.0, GLib won't provide a pipe() macro any longer, + so use _pipe() directly (#492077). + * win32/common/dirent.c: (_treaddir): + Add a couple of casts to make it build without warnings with MSVC. + * win32/common/libgstreamer.def: + Add some more symbols that need to be exported. +2007-10-31 Tim-Philipp Müller <tim at centricular dot net> * tests/examples/metadata/read-metadata.c: (message_loop): Use _KEEP as merge mode rather than _KEEP_ALL, so tags arriving in a second or third tag message are added to Index: gsttrace.c RCS file: /cvs/gstreamer/gstreamer/gst/gsttrace.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- gsttrace.c 7 Mar 2007 17:26:49 -0000 1.33 +++ gsttrace.c 31 Oct 2007 22:01:02 -0000 1.34 @@ -56,6 +56,10 @@ #include <fcntl.h> #include <string.h> +#if defined (_MSC_VER) && _MSC_VER >= 1400 +# include <io.h> +#endif #include "gst_private.h" #include "gstinfo.h" Index: gstnetclientclock.c RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/gstnetclientclock.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gstnetclientclock.c 9 Oct 2006 10:14:28 -0000 1.22 +++ gstnetclientclock.c 31 Oct 2007 22:01:02 -0000 1.23 @@ -50,11 +50,17 @@ #include "config.h" #endif -#include <unistd.h> - #include "gstnettimepacket.h" #include "gstnetclientclock.h" +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#include <io.h> GST_DEBUG_CATEGORY_STATIC (ncc_debug); #define GST_CAT_DEFAULT (ncc_debug) @@ -610,7 +616,7 @@ #ifdef G_OS_WIN32 GST_DEBUG_OBJECT (ret, "creating pipe"); - if ((iret = pipe (CONTROL_SOCKETS (ret))) < 0) + if ((iret = _pipe (CONTROL_SOCKETS (ret), 4096, _O_BINARY)) < 0) goto no_socket_pair; #else GST_DEBUG_OBJECT (ret, "creating socket pair"); Index: gstnettimepacket.c RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/gstnettimepacket.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gstnettimepacket.c 5 Sep 2006 08:35:20 -0000 1.6 +++ gstnettimepacket.c 31 Oct 2007 22:01:02 -0000 1.7 @@ -188,6 +188,7 @@ fcntl (fd, F_SETFL, fdflags | O_NONBLOCK); #elif defined G_OS_WIN32 flags = 1; + send_flags = 0; send_flags = MSG_DONTWAIT; @@ -196,11 +197,10 @@ ioctlsocket (fd, FIONBIO, &flags); /* Set nonblocking mode */ - ret = sendto (fd, buffer, GST_NET_TIME_PACKET_SIZE, NULL, addr, len); -#else - ret = sendto (fd, buffer, GST_NET_TIME_PACKET_SIZE, send_flags, addr, len); + ret = sendto (fd, buffer, GST_NET_TIME_PACKET_SIZE, send_flags, addr, len); #ifdef __CYGWIN__ fcntl (fd, F_SETFL, fdflags); Index: gstnettimeprovider.c RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/gstnettimeprovider.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gstnettimeprovider.c 29 Sep 2006 08:22:22 -0000 1.13 +++ gstnettimeprovider.c 31 Oct 2007 22:01:03 -0000 1.14 @@ -44,7 +44,14 @@ #include <glib.h> #include <unistd.h> #ifndef G_OS_WIN32 #include <sys/ioctl.h> @@ -522,7 +529,7 @@ Index: dirent.c RCS file: /cvs/gstreamer/gstreamer/win32/common/dirent.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dirent.c 6 Feb 2006 21:29:04 -0000 1.3 +++ dirent.c 31 Oct 2007 22:01:03 -0000 1.4 @@ -285,7 +285,7 @@ /* Start the search */ - dirp->dd_handle = _tfindfirst (dirp->dd_name, &(dirp->dd_dta)); + dirp->dd_handle = (long) _tfindfirst (dirp->dd_name, &(dirp->dd_dta)); if (dirp->dd_handle == -1) { @@ -353,7 +353,7 @@ * file name. */ - dirp->dd_dir.d_namlen = _tcslen (dirp->dd_dta.name); + dirp->dd_dir.d_namlen = (unsigned short) _tcslen (dirp->dd_dta.name); _tcscpy (dirp->dd_dir.d_name, dirp->dd_dta.name); Index: libgstreamer.def RCS file: /cvs/gstreamer/gstreamer/win32/common/libgstreamer.def,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- libgstreamer.def 29 Sep 2007 11:46:31 -0000 1.41 +++ libgstreamer.def 31 Oct 2007 22:01:03 -0000 1.42 @@ -103,6 +103,7 @@ GST_CAT_CALL_TRACE DATA GST_CAT_CAPS DATA GST_CAT_CLOCK DATA + GST_CAT_DEFAULT DATA GST_CAT_ELEMENT_PADS DATA GST_CAT_ERROR_SYSTEM DATA GST_CAT_EVENT DATA @@ -349,6 +350,8 @@ gst_message_new_element gst_message_new_eos gst_message_new_error + gst_message_new_info + gst_message_new_latency gst_message_new_new_clock gst_message_new_segment_done gst_message_new_segment_start |