gst-libs/gst/fft/: Include our own _stdint.h instead of sys/types.h, makes MingW happy (#492306).
Original commit message from CVS: Patch by: Vincent Torri <vtorri at univ-evry dot fr> * gst-libs/gst/fft/kiss_fft_s16.h: (KISS_FFT_S16_MALLOC): * gst-libs/gst/fft/kiss_fft_s32.h: (KISS_FFT_S32_MALLOC): Include our own _stdint.h instead of sys/types.h, makes MingW happy (#492306). * gst-libs/gst/rtsp/gstrtspconnection.c: (gst_rtsp_connection_create): Use _pipe directly, GLib doesn't have a pipe() macro any longer (it disappeared in GLib 2.14.0) (#492306). * gst-libs/gst/sdp/Makefile.am: * gst-libs/gst/sdp/gstsdpmessage.c: Fix includes and LIBS for win32/Mingw (#492306). * tests/examples/dynamic/addstream.c (pause_play_stream): Use more portable g_usleep() instead of sleep() (#492306).
This commit is contained in:
parent
05a205860d
commit
be04e7c294
20
ChangeLog
20
ChangeLog
@ -1,3 +1,23 @@
|
|||||||
|
2007-11-01 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
Patch by: Vincent Torri <vtorri at univ-evry dot fr>
|
||||||
|
|
||||||
|
* gst-libs/gst/fft/kiss_fft_s16.h: (KISS_FFT_S16_MALLOC):
|
||||||
|
* gst-libs/gst/fft/kiss_fft_s32.h: (KISS_FFT_S32_MALLOC):
|
||||||
|
Include our own _stdint.h instead of sys/types.h, makes MingW happy
|
||||||
|
(#492306).
|
||||||
|
|
||||||
|
* gst-libs/gst/rtsp/gstrtspconnection.c: (gst_rtsp_connection_create):
|
||||||
|
Use _pipe directly, GLib doesn't have a pipe() macro any longer
|
||||||
|
(it disappeared in GLib 2.14.0) (#492306).
|
||||||
|
|
||||||
|
* gst-libs/gst/sdp/Makefile.am:
|
||||||
|
* gst-libs/gst/sdp/gstsdpmessage.c:
|
||||||
|
Fix includes and LIBS for win32/Mingw (#492306).
|
||||||
|
|
||||||
|
* tests/examples/dynamic/addstream.c (pause_play_stream):
|
||||||
|
Use more portable g_usleep() instead of sleep() (#492306).
|
||||||
|
|
||||||
2007-11-01 Tim-Philipp Müller <tim at centricular dot net>
|
2007-11-01 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
Patch by: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
|
Patch by: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
|
||||||
|
@ -26,7 +26,8 @@ extern "C" {
|
|||||||
|
|
||||||
#define KISS_FFT_S16_MALLOC malloc
|
#define KISS_FFT_S16_MALLOC malloc
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include "_stdint.h"
|
||||||
|
|
||||||
#define kiss_fft_s16_scalar int16_t
|
#define kiss_fft_s16_scalar int16_t
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -27,7 +27,8 @@ extern "C" {
|
|||||||
#define KISS_FFT_S32_MALLOC malloc
|
#define KISS_FFT_S32_MALLOC malloc
|
||||||
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include "_stdint.h"
|
||||||
|
|
||||||
#define kiss_fft_s32_scalar int32_t
|
#define kiss_fft_s32_scalar int32_t
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -163,7 +163,7 @@ gst_rtsp_connection_create (GstRTSPUrl * url, GstRTSPConnection ** conn)
|
|||||||
#ifdef G_OS_WIN32
|
#ifdef G_OS_WIN32
|
||||||
/* This should work on UNIX too. PF_UNIX sockets replaced with pipe */
|
/* This should work on UNIX too. PF_UNIX sockets replaced with pipe */
|
||||||
/* pipe( CONTROL_SOCKETS(newconn) ) */
|
/* pipe( CONTROL_SOCKETS(newconn) ) */
|
||||||
if ((ret = pipe (CONTROL_SOCKETS (newconn))) < 0)
|
if ((ret = _pipe (CONTROL_SOCKETS (newconn), 4096, _O_BINARY)) < 0)
|
||||||
goto no_socket_pair;
|
goto no_socket_pair;
|
||||||
|
|
||||||
ioctlsocket (READ_SOCKET (newconn), FIONBIO, &flags);
|
ioctlsocket (READ_SOCKET (newconn), FIONBIO, &flags);
|
||||||
|
@ -8,5 +8,5 @@ lib_LTLIBRARIES = libgstsdp-@GST_MAJORMINOR@.la
|
|||||||
libgstsdp_@GST_MAJORMINOR@_la_SOURCES = gstsdpmessage.c
|
libgstsdp_@GST_MAJORMINOR@_la_SOURCES = gstsdpmessage.c
|
||||||
|
|
||||||
libgstsdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
libgstsdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
libgstsdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
|
libgstsdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(WIN32_LIBS)
|
||||||
libgstsdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
libgstsdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
||||||
|
@ -54,12 +54,25 @@
|
|||||||
* Last reviewed on 2007-07-24 (0.10.14)
|
* Last reviewed on 2007-07-24 (0.10.14)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <glib.h> /* for G_OS_WIN32 */
|
||||||
|
|
||||||
|
#ifdef G_OS_WIN32
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#else
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "gstsdpmessage.h"
|
#include "gstsdpmessage.h"
|
||||||
|
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
static GstElement *pipeline;
|
static GstElement *pipeline;
|
||||||
@ -93,7 +91,7 @@ pause_play_stream (GstElement * bin, gint seconds)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (seconds)
|
if (seconds)
|
||||||
sleep (seconds);
|
g_usleep (seconds * G_USEC_PER_SEC);
|
||||||
|
|
||||||
if (punch_in) {
|
if (punch_in) {
|
||||||
/* new bin has to be aligned with previous running_time. We do this by taking
|
/* new bin has to be aligned with previous running_time. We do this by taking
|
||||||
|
Loading…
x
Reference in New Issue
Block a user