From ef3ed344af7d0eb330f68c85d31acfa9471d1573 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 18 Dec 2003 09:49:50 +0000 Subject: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3 Original commit message from CVS: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3 --- gst-libs/gst/tuner/tuner.h | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'gst-libs/gst/tuner/tuner.h') diff --git a/gst-libs/gst/tuner/tuner.h b/gst-libs/gst/tuner/tuner.h index 1cd51e11..b1991c2c 100644 --- a/gst-libs/gst/tuner/tuner.h +++ b/gst-libs/gst/tuner/tuner.h @@ -31,11 +31,11 @@ G_BEGIN_DECLS #define GST_TYPE_TUNER \ (gst_tuner_get_type ()) #define GST_TUNER(obj) \ - (GST_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner)) + (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner)) #define GST_TUNER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER, GstTunerClass)) #define GST_IS_TUNER(obj) \ - (GST_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER)) + (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER)) #define GST_IS_TUNER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER)) #define GST_TUNER_GET_CLASS(inst) \ @@ -66,6 +66,20 @@ typedef struct _GstTunerClass { GstTunerChannel *channel); gint (* signal_strength) (GstTuner *tuner, GstTunerChannel *channel); + + /* signals */ + void (*channel_changed) (GstTuner *tuner, + GstTunerChannel *channel); + void (*norm_changed) (GstTuner *tuner, + GstTunerNorm *norm); + void (*frequency_changed) (GstTuner *tuner, + GstTunerChannel *channel, + gulong frequency); + void (*signal_changed) (GstTuner *tuner, + GstTunerChannel *channel, + gint signal); + + gpointer _gst_reserved[GST_PADDING]; } GstTunerClass; GType gst_tuner_get_type (void); @@ -91,6 +105,18 @@ gulong gst_tuner_get_frequency (GstTuner *tuner, gint gst_tuner_signal_strength (GstTuner *tuner, GstTunerChannel *channel); +/* trigger signals */ +void gst_tuner_channel_changed (GstTuner *tuner, + GstTunerChannel *channel); +void gst_tuner_norm_changed (GstTuner *tuner, + GstTunerNorm *norm); +void gst_tuner_frequency_changed (GstTuner *tuner, + GstTunerChannel *channel, + gulong frequency); +void gst_tuner_signal_changed (GstTuner *tuner, + GstTunerChannel *channel, + gint signal); + G_END_DECLS #endif /* __GST_TUNER_H__ */ -- cgit v1.2.1