mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

Updates to make it compile against gtk1.2 again. mostly marshal stuff.

Browse source 
Original commit message from CVS:
Updates to make it compile against gtk1.2 again. mostly marshal stuff.
This commit is contained in:
Wim Taymans 2001-09-10 20:11:22 +00:00
parent 47c7a3c430
commit 8d3ec40f5e
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/elements/gsthttpsrc.c
View file

@ -146,6 +146,7 @@ gst_httpsrc_get(GstPad *pad)
return NULL;
}
g_print ("%d\n", readbytes);
if (readbytes < src->bytes_per_read) {
// FIXME: set the buffer's EOF bit here
}
@ -168,6 +169,7 @@ gst_httpsrc_open_url (GstHttpSrc *httpsrc)
ghttp_set_uri (httpsrc->request, httpsrc->url);
ghttp_set_sync (httpsrc->request, ghttp_async);
ghttp_set_chunksize (httpsrc->request, httpsrc->bytes_per_read);
ghttp_set_header (httpsrc->request, "User-Agent", "GstHttpSrc");
ghttp_prepare (httpsrc->request);

5
gst/gobject2gtk.h
View file

@ -72,6 +72,11 @@ typedef struct _GObjectClass GObjectClass;
#define gst_marshal_VOID__OBJECT_POINTER gtk_marshal_NONE__POINTER_POINTER
#define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT
#define gst_marshal_VOID__INT gtk_marshal_NONE__INT
#define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING
#define gst_marshal_VOID__VOID gtk_marshal_NONE__NONE
#define gst_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
#define gst_marshal_VOID__POINTER gtk_marshal_NONE__POINTER
/* General macros */
#ifdef __cplusplus

2
gst/gstbin.c
View file

@ -109,7 +109,7 @@ gst_bin_class_init (GstBinClass *klass)
gst_bin_signals[OBJECT_ADDED] =
g_signal_new ("object_added", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GstBinClass, object_added), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_ELEMENT);
klass->change_state_type = gst_bin_change_state_type;

4
gst/gstbuffer.c
View file

@ -102,7 +102,6 @@ gst_buffer_new_from_pool (GstBufferPool *pool, guint64 location, gint size)
buffer->pool = pool;
buffer->free = pool->buffer_free;
buffer->copy = pool->buffer_copy;
buffer->pool_private = pool->user_data;
return buffer;
}
@ -454,9 +453,6 @@ gst_buffer_span (GstBuffer *buf1, guint32 offset, GstBuffer *buf2, guint32 len)
if (buf2->maxage > buf1->maxage) newbuf->maxage = buf2->maxage;
else newbuf->maxage = buf1->maxage;
newbuf->parent = NULL;
newbuf->pool = NULL;
return newbuf;
}

8
gst/gstelement.c
View file

@ -108,22 +108,22 @@ gst_element_class_init (GstElementClass *klass)
gst_element_signals[NEW_PAD] =
g_signal_new ("new_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, new_pad), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_PAD);
gst_element_signals[PAD_REMOVED] =
g_signal_new ("pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, pad_removed), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_PAD);
gst_element_signals[NEW_GHOST_PAD] =
g_signal_new ("new_ghost_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, new_ghost_pad), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_PAD);
gst_element_signals[GHOST_PAD_REMOVED] =
g_signal_new ("ghost_pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, ghost_pad_removed), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_PAD);
gst_element_signals[ERROR] =
g_signal_new ("error", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,

3
gst/gstpad.c
View file

@ -28,7 +28,6 @@
#include "gsttype.h"
#include "gstbin.h"
#include "gstscheduler.h"
#include "gstmarshal.h"
/***** Start with the base GstPad class *****/
@ -1632,7 +1631,7 @@ gst_padtemplate_class_init (GstPadTemplateClass *klass)
gst_padtemplate_signals[TEMPL_PAD_CREATED] =
g_signal_new ("pad_created", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstPadTemplateClass, pad_created), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
GST_TYPE_PAD);

2
plugins/elements/gsthttpsrc.c
View file

@ -146,6 +146,7 @@ gst_httpsrc_get(GstPad *pad)
return NULL;
}
g_print ("%d\n", readbytes);
if (readbytes < src->bytes_per_read) {
// FIXME: set the buffer's EOF bit here
}
@ -168,6 +169,7 @@ gst_httpsrc_open_url (GstHttpSrc *httpsrc)
ghttp_set_uri (httpsrc->request, httpsrc->url);
ghttp_set_sync (httpsrc->request, ghttp_async);
ghttp_set_chunksize (httpsrc->request, httpsrc->bytes_per_read);
ghttp_set_header (httpsrc->request, "User-Agent", "GstHttpSrc");
ghttp_prepare (httpsrc->request);