mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesrc: small cleanups

Browse source
This commit is contained in:
Wim Taymans 2011-08-04 16:25:04 +02:00
parent 84371e4066
commit fcbe26cd6f
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/pulse/pulsesrc.c
View file

@ -1006,12 +1006,8 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted, if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted,
PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE |
PA_STREAM_NOT_MONOTONIC | PA_STREAM_ADJUST_LATENCY | PA_STREAM_NOT_MONOTONIC | PA_STREAM_ADJUST_LATENCY |
PA_STREAM_START_CORKED) < 0) { PA_STREAM_START_CORKED) < 0)
GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED, goto connect_failed;
("Failed to connect stream: %s",
pa_strerror (pa_context_errno (pulsesrc->context))), (NULL));
goto unlock_and_fail;
}
pulsesrc->corked = TRUE; pulsesrc->corked = TRUE;
@ -1020,12 +1016,8 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
state = pa_stream_get_state (pulsesrc->stream); state = pa_stream_get_state (pulsesrc->stream);
if (!PA_STREAM_IS_GOOD (state)) { if (!PA_STREAM_IS_GOOD (state))
GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED, goto stream_is_bad;
("Failed to connect stream: %s",
pa_strerror (pa_context_errno (pulsesrc->context))), (NULL));
goto unlock_and_fail;
}
if (state == PA_STREAM_READY) if (state == PA_STREAM_READY)
break; break;
@ -1061,6 +1053,21 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
return TRUE; return TRUE;
/* ERRORS */
connect_failed:
{
GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED,
("Failed to connect stream: %s",
pa_strerror (pa_context_errno (pulsesrc->context))), (NULL));
goto unlock_and_fail;
}
stream_is_bad:
{
GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED,
("Failed to connect stream: %s",
pa_strerror (pa_context_errno (pulsesrc->context))), (NULL));
goto unlock_and_fail;
}
unlock_and_fail: unlock_and_fail:
{ {
gst_pulsesrc_destroy_stream (pulsesrc); gst_pulsesrc_destroy_stream (pulsesrc);