summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-05-14 10:49:55 +0000
committerLennart Poettering <lennart@poettering.net>2007-05-14 10:49:55 +0000
commit91f2fea297381a64939c7f2d4ddb4728a3d42aa8 (patch)
tree1b03b30ac1553a286f7cf3167cda17e5e2ee82c9
parentbec5d6e03388a07d9d58a8564f665782231ef8ec (diff)
Allow passing NULL for client_name
git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@14 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
-rw-r--r--common.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/common.c b/common.c
index fe6c8f0..7ace728 100644
--- a/common.c
+++ b/common.c
@@ -32,7 +32,6 @@ int sa_stream_create_opaque(
int error;
sa_return_val_if_fail(s, SA_ERROR_INVALID);
- sa_return_val_if_fail(client_name, SA_ERROR_INVALID);
sa_return_val_if_fail(mode == SA_MODE_RDONLY || mode == SA_MODE_WRONLY || mode == SA_MODE_RDWR, SA_ERROR_INVALID);
sa_return_val_if_fail(codec, SA_ERROR_INVALID);
@@ -46,8 +45,9 @@ int sa_stream_create_opaque(
goto fail;
}
- if ((error = sa_stream_change_meta_data(*s, SA_META_CLIENT_NAME, client_name, strlen(client_name))) < 0)
- goto fail;
+ if (client_name)
+ if ((error = sa_stream_change_meta_data(*s, SA_META_CLIENT_NAME, client_name, strlen(client_name))) < 0)
+ goto fail;
oil_init();
@@ -69,7 +69,6 @@ int sa_stream_create_pcm(
int ret;
sa_return_val_if_fail(s, SA_ERROR_INVALID);
- sa_return_val_if_fail(client_name, SA_ERROR_INVALID);
sa_return_val_if_fail(mode == SA_MODE_RDONLY || mode == SA_MODE_WRONLY || mode == SA_MODE_RDWR, SA_ERROR_INVALID);
sa_return_val_if_fail(format < _SA_PCM_FORMAT_MAX, SA_ERROR_INVALID);
sa_return_val_if_fail(rate > 0, SA_ERROR_INVALID);
@@ -95,8 +94,9 @@ int sa_stream_create_pcm(
if ((ret = sa_stream_change_rate(*s, rate)))
goto fail;
- if ((ret = sa_stream_change_meta_data(*s, SA_META_CLIENT_NAME, client_name, strlen(client_name))) < 0)
- goto fail;
+ if (client_name)
+ if ((ret = sa_stream_change_meta_data(*s, SA_META_CLIENT_NAME, client_name, strlen(client_name))) < 0)
+ goto fail;
oil_init();