summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2011-06-18 15:36:18 -0700
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-06-19 17:46:35 -0700
commit257bdcafe3d8253bb9a6ffbeb7123968ea74aafb (patch)
tree7802cc1e943e6467f6e82c9d1b5921eb1635f197 /src/tests
parent573b9d6ca87489cad40a6abb8c69c0c26569691b (diff)
stream: Simplify passing of formats in extended API
Passing a NULL-terminated array of pa_format_info pointers is a bit unwieldy for clients. Instead of this, let's pass in an array of pointers and the number of elements in the array.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/extended-test.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c
index f99a85c3..ab8ab2c0 100644
--- a/src/tests/extended-test.c
+++ b/src/tests/extended-test.c
@@ -122,7 +122,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
for (i = 0; i < NSTREAMS; i++) {
char name[64];
- pa_format_info *formats[2] = { NULL };
+ pa_format_info *formats[1];
formats[0] = pa_format_info_new();
formats[0]->encoding = PA_ENCODING_PCM;
@@ -134,10 +134,12 @@ static void context_state_callback(pa_context *c, void *userdata) {
snprintf(name, sizeof(name), "stream #%i", i);
- streams[i] = pa_stream_new_extended(c, name, formats, NULL);
+ streams[i] = pa_stream_new_extended(c, name, formats, 1, NULL);
assert(streams[i]);
pa_stream_set_state_callback(streams[i], stream_state_callback, (void*) (long) i);
pa_stream_connect_playback(streams[i], NULL, &buffer_attr, PA_STREAM_START_CORKED, NULL, i == 0 ? NULL : streams[0]);
+
+ pa_format_info_free(formats[0]);
}
break;