mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa, solaris, oss: remove unnecessary error handling when suspending

Browse source 
Suspending never fails.
This commit is contained in:
Tanu Kaskinen 2018-02-19 16:48:19 +02:00
parent d6e39b5e89
commit 7f201b1fd4
4 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/alsa/alsa-sink.c
View file

@ -939,7 +939,7 @@ static int build_pollfd(struct userdata *u) {
} }
/* Called from IO context */ /* Called from IO context */
static int suspend(struct userdata *u) { static void suspend(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(u->pcm_handle); pa_assert(u->pcm_handle);
@ -964,8 +964,6 @@ static int suspend(struct userdata *u) {
pa_sink_set_max_request_within_thread(u->sink, 0); pa_sink_set_max_request_within_thread(u->sink, 0);
pa_log_info("Device suspended..."); pa_log_info("Device suspended...");
return 0;
} }
/* Called from IO context */ /* Called from IO context */
@ -1192,12 +1190,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) { switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
case PA_SINK_SUSPENDED: { case PA_SINK_SUSPENDED: {
int r;
pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state)); pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
if ((r = suspend(u)) < 0) suspend(u);
return r;
break; break;
} }

9
src/modules/alsa/alsa-source.c
View file

@ -837,7 +837,7 @@ static int build_pollfd(struct userdata *u) {
} }
/* Called from IO context */ /* Called from IO context */
static int suspend(struct userdata *u) { static void suspend(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(u->pcm_handle); pa_assert(u->pcm_handle);
@ -853,8 +853,6 @@ static int suspend(struct userdata *u) {
} }
pa_log_info("Device suspended..."); pa_log_info("Device suspended...");
return 0;
} }
/* Called from IO context */ /* Called from IO context */
@ -1047,12 +1045,9 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) { switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
case PA_SOURCE_SUSPENDED: { case PA_SOURCE_SUSPENDED: {
int r;
pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state)); pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
if ((r = suspend(u)) < 0) suspend(u);
return r;
break; break;
} }

18
src/modules/module-solaris.c
View file

@ -348,7 +348,7 @@ static int open_audio_device(struct userdata *u, pa_sample_spec *ss) {
return u->fd; return u->fd;
} }
static int suspend(struct userdata *u) { static void suspend(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(u->fd >= 0); pa_assert(u->fd >= 0);
@ -364,8 +364,6 @@ static int suspend(struct userdata *u) {
} }
pa_log_info("Device suspended."); pa_log_info("Device suspended.");
return 0;
} }
static int unsuspend(struct userdata *u) { static int unsuspend(struct userdata *u) {
@ -403,10 +401,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
pa_smoother_pause(u->smoother, pa_rtclock_now()); pa_smoother_pause(u->smoother, pa_rtclock_now());
if (!u->source || u->source_suspended) { if (!u->source || u->source_suspended)
if (suspend(u) < 0) suspend(u);
return -1;
}
u->sink_suspended = true; u->sink_suspended = true;
break; break;
@ -457,10 +454,9 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state)); pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
if (!u->sink || u->sink_suspended) { if (!u->sink || u->sink_suspended)
if (suspend(u) < 0) suspend(u);
return -1;
}
u->source_suspended = true; u->source_suspended = true;
break; break;

16
src/modules/oss/module-oss.c
View file

@ -485,7 +485,7 @@ static void build_pollfd(struct userdata *u) {
} }
/* Called from IO context */ /* Called from IO context */
static int suspend(struct userdata *u) { static void suspend(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(u->fd >= 0); pa_assert(u->fd >= 0);
@ -530,8 +530,6 @@ static int suspend(struct userdata *u) {
} }
pa_log_info("Device suspended..."); pa_log_info("Device suspended...");
return 0;
} }
/* Called from IO context */ /* Called from IO context */
@ -670,10 +668,8 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
case PA_SINK_SUSPENDED: case PA_SINK_SUSPENDED:
pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state)); pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
if (!u->source || u->source_suspended) { if (!u->source || u->source_suspended)
if (suspend(u) < 0) suspend(u);
return -1;
}
do_trigger = true; do_trigger = true;
@ -753,10 +749,8 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
case PA_SOURCE_SUSPENDED: case PA_SOURCE_SUSPENDED:
pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state)); pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
if (!u->sink || u->sink_suspended) { if (!u->sink || u->sink_suspended)
if (suspend(u) < 0) suspend(u);
return -1;
}
do_trigger = true; do_trigger = true;