diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-08-20 17:46:48 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-08-20 17:46:48 +0000 |
| commit | 95d423981983bc657539a0e66c5c27db21592ee2 (patch) | |
| tree | 260f5bfb57fc4a686683c1d9289364ec831b3b6d /ext/pulse/pulsemixer.c | |
| parent | 7f880435535413895430106425963cebc6bc32df (diff) | |
ext/pulse/: Use GST_BOILERPLATE everywhere and fix coding style at some places.
Original commit message from CVS:
* ext/pulse/pulsemixer.c: (gst_pulsemixer_class_init),
(gst_pulsemixer_set_property), (gst_pulsemixer_get_property):
* ext/pulse/pulsemixerctrl.c: (gst_pulsemixer_ctrl_subscribe_cb),
(gst_pulsemixer_ctrl_open), (gst_pulsemixer_ctrl_timeout_event),
(gst_pulsemixer_ctrl_set_volume):
* ext/pulse/pulsemixertrack.c: (gst_pulsemixer_track_new):
* ext/pulse/pulseprobe.c: (gst_pulseprobe_open):
* ext/pulse/pulsesink.c: (gst_pulsesink_class_init),
(gst_pulsesink_init), (gst_pulsesink_open),
(gst_pulsesink_prepare), (gst_pulsesink_write),
(gst_pulsesink_delay), (gst_pulsesink_reset):
* ext/pulse/pulsesrc.c: (gst_pulsesrc_class_init),
(gst_pulsesrc_init):
Use GST_BOILERPLATE everywhere and fix coding style at some places.
Fix a locking issue in pulsesink's prepare function.
* ext/pulse/pulseutil.c: (gst_pulse_channel_map_to_gst):
Check if the created channel layout is valid for GStreamer.
Diffstat (limited to 'ext/pulse/pulsemixer.c')
| -rw-r--r-- | ext/pulse/pulsemixer.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c index 434a606c..3a0de9da 100644 --- a/ext/pulse/pulsemixer.c +++ b/ext/pulse/pulsemixer.c @@ -134,7 +134,6 @@ static void gst_pulsemixer_class_init (GstPulseMixerClass * g_class) { GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - GObjectClass *gobject_class = G_OBJECT_CLASS (g_class); gstelement_class->change_state = @@ -200,7 +199,6 @@ static void gst_pulsemixer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstPulseMixer *this = GST_PULSEMIXER (object); switch (prop_id) { @@ -228,11 +226,9 @@ static void gst_pulsemixer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstPulseMixer *this = GST_PULSEMIXER (object); switch (prop_id) { - case PROP_SERVER: g_value_set_string (value, this->server); break; @@ -242,7 +238,6 @@ gst_pulsemixer_get_property (GObject * object, break; case PROP_DEVICE_NAME: - if (this->mixer) { char *t = g_strdup_printf ("%s: %s", this->mixer->type == GST_PULSEMIXER_SINK ? "Playback" : "Capture", |