summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-12 17:06:39 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-12 17:06:39 +0000
commit02e083cbc4956e6c8990ea0e2a888efb912d90c3 (patch)
treeb66e59292401ae8eed8cb0ca3960d6f83d004aaf
parentdbe6bdd2bcd035b0b07d70811593be719c5cc7c0 (diff)
test if sink->monitor_source is set before making use of it
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1228 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/cli-text.c2
-rw-r--r--src/pulsecore/protocol-native.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index eecf68ff..a1a2e564 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -109,7 +109,7 @@ char *pa_sink_list_to_string(pa_core *c) {
sink->driver,
pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink, PA_MIXER_HARDWARE)),
(double) pa_sink_get_latency(sink),
- sink->monitor_source->index,
+ sink->monitor_source ? sink->monitor_source->index : PA_INVALID_INDEX,
pa_sample_spec_snprint(ss, sizeof(ss), &sink->sample_spec),
pa_channel_map_snprint(cm, sizeof(cm), &sink->channel_map));
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index d5a4cf45..98212922 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1276,8 +1276,8 @@ static void sink_fill_tagstruct(pa_tagstruct *t, pa_sink *sink) {
PA_TAG_U32, sink->owner ? sink->owner->index : PA_INVALID_INDEX,
PA_TAG_CVOLUME, pa_sink_get_volume(sink, PA_MIXER_HARDWARE),
PA_TAG_BOOLEAN, pa_sink_get_mute(sink, PA_MIXER_HARDWARE),
- PA_TAG_U32, sink->monitor_source->index,
- PA_TAG_STRING, sink->monitor_source->name,
+ PA_TAG_U32, sink->monitor_source ? sink->monitor_source->index : PA_INVALID_INDEX,
+ PA_TAG_STRING, sink->monitor_source ? sink->monitor_source->name : NULL,
PA_TAG_USEC, pa_sink_get_latency(sink),
PA_TAG_STRING, sink->driver,
PA_TAG_U32,