From 5cbfd21fe5c984eec2b9e1e49179afb5931fb61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 14 Nov 2006 12:33:33 +0000
Subject: [PATCH] sys/dvb/gstdvbsrc.*: Fix minor printf format issue; remove
 overly paranoid checks in create function; fix GObject boi...

Original commit message from CVS:
* 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.
---
 ChangeLog           |  7 +++++++
 sys/dvb/gstdvbsrc.c |  9 +++------
 sys/dvb/gstdvbsrc.h | 14 ++++----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eaed1e5039..12da9b14ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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  <wim@fluendo.com>
 
 	* gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration),
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index 8eedb9dc69..6012d82375 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -837,17 +837,14 @@ read_device (int fd, const char *fd_name, int size)
 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;
 
diff --git a/sys/dvb/gstdvbsrc.h b/sys/dvb/gstdvbsrc.h
index 4c1ecccdd2..e9756a67ed 100644
--- a/sys/dvb/gstdvbsrc.h
+++ b/sys/dvb/gstdvbsrc.h
@@ -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 @@ extern "C"
 #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 @@ extern "C"
 
   GType gst_dvbsrc_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif                          /* __cplusplus */
+G_END_DECLS
 
 #endif                          /* __GST_DVBSRC_H__ */