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/pulseutil.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/pulseutil.c')
| -rw-r--r-- | ext/pulse/pulseutil.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/pulse/pulseutil.c b/ext/pulse/pulseutil.c index 62dbc5b0..38fa7bcc 100644 --- a/ext/pulse/pulseutil.c +++ b/ext/pulse/pulseutil.c @@ -186,6 +186,9 @@ gst_pulse_channel_map_to_gst (const pa_channel_map * map, } } + if (!invalid && !gst_audio_check_channel_positions (pos, spec->channels)) + invalid = TRUE; + if (invalid) { for (i = 0; i < spec->channels; i++) pos[i] = GST_AUDIO_CHANNEL_POSITION_NONE; |
