From 01a7e0467d7b776bd231f1c20535041e6664e375 Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Thu, 15 Jan 2004 15:50:10 +0000 Subject: ext/alsa/gstalsamixer.c: Setting mixer interface type to HARDWARE. Original commit message from CVS: 2004-01-15 Julien MOUTTE * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_interface_init): Setting mixer interface type to HARDWARE. * gst-libs/gst/mixer/mixer.c: (gst_mixer_class_init): Adding a default type to SOFTWARE. * gst-libs/gst/mixer/mixer.h: Adding mixer interface type and macro. * gst-libs/gst/mixer/mixertrack.h: Adding mixertrack flag SOFTWARE. * gst/volume/gstvolume.c: (gst_volume_interface_supported), (gst_volume_interface_init), (gst_volume_list_tracks), (gst_volume_set_volume), (gst_volume_get_volume), (gst_volume_set_mute), (gst_volume_mixer_init), (gst_volume_dispose), (gst_volume_get_type), (volume_class_init), (volume_init): Implementing mixer interface. * gst/volume/gstvolume.h: Adding tracklist for mixer interface. * sys/oss/gstosselement.c: (gst_osselement_get_type), (gst_osselement_change_state): Removing some trailing commas in structures. * sys/oss/gstossmixer.c: (gst_ossmixer_interface_init): Setting mixer interface type to HARDWARE. * sys/v4l/gstv4lcolorbalance.c: (gst_v4l_color_balance_interface_init): Setting colorbalance interface type to HARDWARE. * sys/v4l2/gstv4l2colorbalance.c: (gst_v4l2_color_balance_interface_init): Setting colorbalance interface type to HARDWARE. * sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain): use exactly the same code than ximagesink for event handling. --- sys/oss/gstosselement.c | 9 ++++----- sys/oss/gstossmixer.c | 2 ++ sys/v4l2/gstv4l2colorbalance.c | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'sys') diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c index 4c1356ab..756a893c 100644 --- a/sys/oss/gstosselement.c +++ b/sys/oss/gstosselement.c @@ -88,22 +88,22 @@ gst_osselement_get_type (void) NULL, sizeof(GstOssElement), 0, - (GInstanceInitFunc)gst_osselement_init, + (GInstanceInitFunc)gst_osselement_init }; static const GInterfaceInfo ossiface_info = { (GInterfaceInitFunc) gst_oss_interface_init, NULL, - NULL, + NULL }; static const GInterfaceInfo ossmixer_info = { (GInterfaceInitFunc) gst_ossmixer_interface_init, NULL, - NULL, + NULL }; static const GInterfaceInfo ossprobe_info = { (GInterfaceInitFunc) gst_ossprobe_interface_init, NULL, - NULL, + NULL }; osselement_type = g_type_register_static (GST_TYPE_ELEMENT, @@ -937,4 +937,3 @@ gst_osselement_change_state (GstElement *element) return GST_STATE_SUCCESS; } - diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c index ccdf6e19..6bc89ccd 100644 --- a/sys/oss/gstossmixer.c +++ b/sys/oss/gstossmixer.c @@ -212,6 +212,8 @@ gst_oss_interface_init (GstImplementsInterfaceClass *klass) void gst_ossmixer_interface_init (GstMixerClass *klass) { + GST_MIXER_TYPE (klass) = GST_MIXER_HARDWARE; + /* default virtual functions */ klass->list_tracks = gst_ossmixer_list_tracks; klass->set_volume = gst_ossmixer_set_volume; diff --git a/sys/v4l2/gstv4l2colorbalance.c b/sys/v4l2/gstv4l2colorbalance.c index d0c1dcf8..0fd18677 100644 --- a/sys/v4l2/gstv4l2colorbalance.c +++ b/sys/v4l2/gstv4l2colorbalance.c @@ -87,6 +87,8 @@ gst_v4l2_color_balance_channel_init (GstV4l2ColorBalanceChannel *channel) void gst_v4l2_color_balance_interface_init (GstColorBalanceClass *klass) { + GST_COLOR_BALANCE_TYPE (klass) = GST_COLOR_BALANCE_HARDWARE; + /* default virtual functions */ klass->list_channels = gst_v4l2_color_balance_list_channels; klass->set_value = gst_v4l2_color_balance_set_value; -- cgit