Move over from GstInterface to GstImplementsInterface. Also adds some signals to several interfaces
Original commit message from CVS: Move over from GstInterface to GstImplementsInterface. Also adds some signals to several interfaces
This commit is contained in:
parent
45aff4bc9c
commit
bac7d40601
@ -110,7 +110,7 @@ gst_osselement_get_type (void)
|
|||||||
"GstOssElement",
|
"GstOssElement",
|
||||||
&osselement_info, 0);
|
&osselement_info, 0);
|
||||||
g_type_add_interface_static (osselement_type,
|
g_type_add_interface_static (osselement_type,
|
||||||
GST_TYPE_INTERFACE,
|
GST_TYPE_IMPLEMENTS_INTERFACE,
|
||||||
&ossiface_info);
|
&ossiface_info);
|
||||||
g_type_add_interface_static (osselement_type,
|
g_type_add_interface_static (osselement_type,
|
||||||
GST_TYPE_MIXER,
|
GST_TYPE_MIXER,
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
static void gst_ossmixer_track_class_init (GstOssMixerTrackClass *klass);
|
static void gst_ossmixer_track_class_init (GstOssMixerTrackClass *klass);
|
||||||
static void gst_ossmixer_track_init (GstOssMixerTrack *track);
|
static void gst_ossmixer_track_init (GstOssMixerTrack *track);
|
||||||
|
|
||||||
static gboolean gst_ossmixer_supported (GstInterface *iface,
|
static gboolean gst_ossmixer_supported (GstImplementsInterface *iface,
|
||||||
GType iface_type);
|
GType iface_type);
|
||||||
static const GList *
|
static const GList *
|
||||||
gst_ossmixer_list_tracks (GstMixer *ossmixer);
|
gst_ossmixer_list_tracks (GstMixer *ossmixer);
|
||||||
@ -203,7 +203,7 @@ gst_ossmixer_track_new (GstOssElement *oss,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
gst_oss_interface_init (GstInterfaceClass *klass)
|
gst_oss_interface_init (GstImplementsInterfaceClass *klass)
|
||||||
{
|
{
|
||||||
/* default virtual functions */
|
/* default virtual functions */
|
||||||
klass->supported = gst_ossmixer_supported;
|
klass->supported = gst_ossmixer_supported;
|
||||||
@ -221,8 +221,8 @@ gst_ossmixer_interface_init (GstMixerClass *klass)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
gst_ossmixer_supported (GstInterface *iface,
|
gst_ossmixer_supported (GstImplementsInterface *iface,
|
||||||
GType iface_type)
|
GType iface_type)
|
||||||
{
|
{
|
||||||
g_assert (iface_type == GST_TYPE_MIXER);
|
g_assert (iface_type == GST_TYPE_MIXER);
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ typedef struct _GstOssMixerTrackClass {
|
|||||||
GType gst_ossmixer_track_get_type (void);
|
GType gst_ossmixer_track_get_type (void);
|
||||||
|
|
||||||
void gst_ossmixer_interface_init (GstMixerClass *klass);
|
void gst_ossmixer_interface_init (GstMixerClass *klass);
|
||||||
void gst_oss_interface_init (GstInterfaceClass *klass);
|
void gst_oss_interface_init (GstImplementsInterfaceClass *klass);
|
||||||
void gst_ossmixer_build_list (GstOssElement *oss);
|
void gst_ossmixer_build_list (GstOssElement *oss);
|
||||||
void gst_ossmixer_free_list (GstOssElement *oss);
|
void gst_ossmixer_free_list (GstOssElement *oss);
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ static guint gst_v4l2element_signals[LAST_SIGNAL] = { 0 };
|
|||||||
|
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
gst_v4l2_iface_supported (GstInterface *iface,
|
gst_v4l2_iface_supported (GstImplementsInterface *iface,
|
||||||
GType iface_type)
|
GType iface_type)
|
||||||
{
|
{
|
||||||
GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
|
GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ gst_v4l2_iface_supported (GstInterface *iface,
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_v4l2_interface_init (GstInterfaceClass *klass)
|
gst_v4l2_interface_init (GstImplementsInterfaceClass *klass)
|
||||||
{
|
{
|
||||||
/* default virtual functions */
|
/* default virtual functions */
|
||||||
klass->supported = gst_v4l2_iface_supported;
|
klass->supported = gst_v4l2_iface_supported;
|
||||||
@ -315,7 +315,7 @@ gst_v4l2element_get_type (void)
|
|||||||
"GstV4l2Element", &v4l2element_info, 0);
|
"GstV4l2Element", &v4l2element_info, 0);
|
||||||
|
|
||||||
g_type_add_interface_static (v4l2element_type,
|
g_type_add_interface_static (v4l2element_type,
|
||||||
GST_TYPE_INTERFACE,
|
GST_TYPE_IMPLEMENTS_INTERFACE,
|
||||||
&v4l2iface_info);
|
&v4l2iface_info);
|
||||||
g_type_add_interface_static (v4l2element_type,
|
g_type_add_interface_static (v4l2element_type,
|
||||||
GST_TYPE_TUNER,
|
GST_TYPE_TUNER,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user