sys/v4l2/gstv4l2tuner.*: Fix _set_channel(): remove useless g_object_notify() for...

Original commit message from CVS:
Patch by: Fredrik Persson  <frepe at broadband net>
* sys/v4l2/gstv4l2tuner.c:
* sys/v4l2/gstv4l2tuner.h:
Fix _set_channel(): remove useless g_object_notify() for "channel"
property that doesn't exist any longer and therefore now also
useless redirect (#338818).

diff --git a/ChangeLog b/ChangeLog
index 2afcc8a..f6306fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-18  Tim-Philipp Müller  <tim at centricular dot net>
+
+       Patch by: Fredrik Persson  <frepe at broadband net>
+
+       * sys/v4l2/gstv4l2tuner.c:
+       * sys/v4l2/gstv4l2tuner.h:
+         Fix _set_channel(): remove useless g_object_notify() for "channel"
+         property that doesn't exist any longer and therefore now also
+         useless redirect (#338818).
+
 2006-10-17  Wim Taymans  <wim@fluendo.com>
 
        * sys/oss/gstosssink.c: (gst_oss_sink_prepare):

diff --git a/sys/v4l2/gstv4l2tuner.c b/sys/v4l2/gstv4l2tuner.c
index 5eb7877..699540c 100644 (file)
--- a/sys/v4l2/gstv4l2tuner.c
+++ b/sys/v4l2/gstv4l2tuner.c
@@ -141,15 +141,6 @@ gst_v4l2_tuner_list_channels (GstV4l2Object * v4l2object)
   return v4l2object->channels;
 }
 
-void
-gst_v4l2_tuner_set_channel_and_notify (GstV4l2Object * v4l2object,
-    GstTunerChannel * channel)
-{
-  if (gst_v4l2_tuner_set_channel (v4l2object, channel)) {
-    g_object_notify (G_OBJECT (v4l2object->element), "channel");
-  }
-}
-
 gboolean
 gst_v4l2_tuner_set_channel (GstV4l2Object * v4l2object,
     GstTunerChannel * channel)

diff --git a/sys/v4l2/gstv4l2tuner.h b/sys/v4l2/gstv4l2tuner.h
index 40d2e1f..5ec2b67 100644 (file)
--- a/sys/v4l2/gstv4l2tuner.h
+++ b/sys/v4l2/gstv4l2tuner.h
@@ -84,8 +84,6 @@ GType gst_v4l2_tuner_norm_get_type (void);
 
 /* channels */
 const GList*      gst_v4l2_tuner_list_channels            (GstV4l2Object * v4l2object);
-void              gst_v4l2_tuner_set_channel_and_notify   (GstV4l2Object * v4l2object,
-                                                          GstTunerChannel * channel);
 GstTunerChannel*  gst_v4l2_tuner_get_channel              (GstV4l2Object * v4l2object);
 gboolean          gst_v4l2_tuner_set_channel              (GstV4l2Object * v4l2object,
                                                           GstTunerChannel * channel);
@@ -118,11 +116,11 @@ interface_as_function ## _tuner_list_channels (GstTuner * mixer)
 }                                                                                     \
                                                                                       \
 static void                                                                           \
-interface_as_function ## _tuner_set_channel_and_notify (GstTuner * mixer,             \
-                                                        GstTunerChannel * channel)    \
+interface_as_function ## _tuner_set_channel (GstTuner * mixer,                        \
+                                             GstTunerChannel * channel)               \
 {                                                                                     \
   Type *this = (Type*) mixer;                                                         \
-  gst_v4l2_tuner_set_channel_and_notify (this->v4l2object, channel);                  \
+  gst_v4l2_tuner_set_channel (this->v4l2object, channel);                             \
 }                                                                                     \
 static GstTunerChannel *                                                              \
 interface_as_function ## _tuner_get_channel (GstTuner * mixer)                        \
@@ -180,7 +178,7 @@ interface_as_function ## _tuner_interface_init (GstTunerClass * klass)
 {                                                                                     \
   /* default virtual functions */                                                     \
   klass->list_channels = interface_as_function ## _tuner_list_channels;               \
-  klass->set_channel = interface_as_function ## _tuner_set_channel_and_notify;        \
+  klass->set_channel = interface_as_function ## _tuner_set_channel;                   \
   klass->get_channel = interface_as_function ## _tuner_get_channel;                   \
                                                                                       \
   klass->list_norms = interface_as_function ## _tuner_list_norms;                     \