diff options
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/cli-text.c | 8 | ||||
| -rw-r--r-- | src/pulsecore/sink.c | 3 | ||||
| -rw-r--r-- | src/pulsecore/source.c | 3 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c index bac61dc9..ec220198 100644 --- a/src/pulsecore/cli-text.c +++ b/src/pulsecore/cli-text.c @@ -111,7 +111,7 @@ char *pa_sink_list_to_string(pa_core *c) { " %c index: %u\n" "\tname: <%s>\n" "\tdriver: <%s>\n" - "\tflags: %s%s%s%s\n" + "\tflags: %s%s%s\n" "\tstate: %s\n" "\tvolume: <%s>\n" "\tmute: <%i>\n" @@ -119,7 +119,7 @@ char *pa_sink_list_to_string(pa_core *c) { "\tmonitor source: <%u>\n" "\tsample spec: <%s>\n" "\tchannel map: <%s>\n" - "\tused by: <%u>\n", + "\tused by: <%u>\n", c->default_sink_name && !strcmp(sink->name, c->default_sink_name) ? '*' : ' ', sink->index, sink->name, @@ -127,7 +127,6 @@ char *pa_sink_list_to_string(pa_core *c) { sink->flags & PA_SINK_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "", sink->flags & PA_SINK_LATENCY ? "LATENCY " : "", sink->flags & PA_SINK_HARDWARE ? "HARDWARE " : "", - sink->flags & PA_SINK_CAN_SUSPEND ? "CAN_SUSPEND " : "", state_table[pa_sink_get_state(sink)], pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink)), !!pa_sink_get_mute(sink), @@ -171,7 +170,7 @@ char *pa_source_list_to_string(pa_core *c) { " %c index: %u\n" "\tname: <%s>\n" "\tdriver: <%s>\n" - "\tflags: %s%s%s%s\n" + "\tflags: %s%s%s\n" "\tstate: %s\n" "\tvolume: <%s>\n" "\tmute: <%u>\n" @@ -186,7 +185,6 @@ char *pa_source_list_to_string(pa_core *c) { source->flags & PA_SOURCE_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "", source->flags & PA_SOURCE_LATENCY ? "LATENCY " : "", source->flags & PA_SOURCE_HARDWARE ? "HARDWARE " : "", - source->flags & PA_SOURCE_CAN_SUSPEND ? "CAN_SUSPEND " : "", state_table[pa_source_get_state(source)], pa_cvolume_snprint(cv, sizeof(cv), pa_source_get_volume(source)), !!pa_source_get_mute(source), diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index b814f837..830960a5 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -170,9 +170,6 @@ static int sink_set_state(pa_sink *s, pa_sink_state_t state) { if (s->state == state) return 0; - if (state == PA_SINK_SUSPENDED && !(s->flags & PA_SINK_CAN_SUSPEND)) - return -1; - if ((s->state == PA_SINK_SUSPENDED && PA_SINK_OPENED(state)) || (PA_SINK_OPENED(s->state) && state == PA_SINK_SUSPENDED)) { pa_sink_input *i; diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 9745a13e..20088c74 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -145,9 +145,6 @@ static int source_set_state(pa_source *s, pa_source_state_t state) { if (s->state == state) return 0; - if (state == PA_SOURCE_SUSPENDED && !(s->flags & PA_SOURCE_CAN_SUSPEND)) - return -1; - if ((s->state == PA_SOURCE_SUSPENDED && PA_SOURCE_OPENED(state)) || (PA_SOURCE_OPENED(s->state) && state == PA_SOURCE_SUSPENDED)) { pa_source_output *o; |