From: <tp...@ke...> - 2006-11-14 12:33:46
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: tpm Date: Tue Nov 14 2006 12:33:45 UTC Log message: * sys/dvb/gstdvbsrc.c: (gst_dvbsrc_create): * sys/dvb/gstdvbsrc.h: Fix minor printf format issue; remove overly paranoid checks in create function; fix GObject boilerplate macros. Modified files: . : ChangeLog sys/dvb : gstdvbsrc.c gstdvbsrc.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2312&r2=1.2313 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/sys/dvb/gstdvbsrc.c.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/sys/dvb/gstdvbsrc.h.diff?r1=1.3&r2=1.4 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2312 retrieving revision 1.2313 diff -u -d -r1.2312 -r1.2313 --- ChangeLog 14 Nov 2006 11:43:40 -0000 1.2312 +++ ChangeLog 14 Nov 2006 12:33:33 -0000 1.2313 @@ -1,3 +1,10 @@ +2006-11-14 Tim-Philipp Müller <tim at centricular dot net> + + * sys/dvb/gstdvbsrc.c: (gst_dvbsrc_create): + * sys/dvb/gstdvbsrc.h: + Fix minor printf format issue; remove overly paranoid checks in + create function; fix GObject boilerplate macros. 2006-11-14 Wim Taymans <wi...@fl...> * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration), Index: gstdvbsrc.c RCS file: /cvs/gstreamer/gst-plugins-bad/sys/dvb/gstdvbsrc.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gstdvbsrc.c 9 Nov 2006 14:00:34 -0000 1.7 +++ gstdvbsrc.c 14 Nov 2006 12:33:33 -0000 1.8 @@ -837,17 +837,14 @@ static GstFlowReturn gst_dvbsrc_create (GstPushSrc * element, GstBuffer ** buf) { - static int quality_signal_rate = 0; + static int quality_signal_rate = 0; /* FIXME: move into object struct? */ gint buffer_size; GstFlowReturn retval = GST_FLOW_ERROR; + GstDvbSrc *object; - GstDvbSrc *object = NULL; - - g_return_val_if_fail (GST_IS_DVBSRC (element), GST_FLOW_ERROR); object = GST_DVBSRC (element); - GST_LOG ("buf: 0x%x fd_dvr: %d", buf, object->fd_dvr); + GST_LOG ("fd_dvr: %d", object->fd_dvr); - g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); //g_object_get(G_OBJECT(object), "blocksize", &buffer_size, NULL); buffer_size = DEFAULT_BUFFER_SIZE; Index: gstdvbsrc.h RCS file: /cvs/gstreamer/gst-plugins-bad/sys/dvb/gstdvbsrc.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstdvbsrc.h 7 Nov 2006 14:46:56 -0000 1.3 +++ gstdvbsrc.h 14 Nov 2006 12:33:33 -0000 1.4 @@ -5,11 +5,7 @@ #include <gst/gst.h> #include <gst/base/gstpushsrc.h> -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef enum { @@ -36,10 +32,10 @@ #define GST_DVBSRC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVBSRC,GstDvbSrc)) #define GST_DVBSRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVBSRC,GstDvbSrc)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVBSRC,GstDvbSrcClass)) #define GST_IS_DVBSRC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVBSRC)) -#define GST_IS_DVBSRC_CLASS(obj) \ +#define GST_IS_DVBSRC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVBSRC)) typedef struct _GstDvbSrc GstDvbSrc; @@ -95,8 +91,6 @@ GType gst_dvbsrc_get_type (void); -} +G_END_DECLS #endif /* __GST_DVBSRC_H__ */ |