From 045c1d602dcba57868845ba3270510593c39480f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 15 May 2008 23:34:41 +0000 Subject: merge glitch-free branch back into trunk git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/tests/proplist-test.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/tests/proplist-test.c') diff --git a/src/tests/proplist-test.c b/src/tests/proplist-test.c index b88f4e5e..5f7a78f3 100644 --- a/src/tests/proplist-test.c +++ b/src/tests/proplist-test.c @@ -28,25 +28,26 @@ #include #include #include +#include int main(int argc, char*argv[]) { pa_proplist *a, *b; char *s, *t; a = pa_proplist_new(); - pa_assert_se(pa_proplist_puts(a, PA_PROP_MEDIA_TITLE, "Brandenburgische Konzerte") == 0); - pa_assert_se(pa_proplist_puts(a, PA_PROP_MEDIA_ARTIST, "Johann Sebastian Bach") == 0); + pa_assert_se(pa_proplist_sets(a, PA_PROP_MEDIA_TITLE, "Brandenburgische Konzerte") == 0); + pa_assert_se(pa_proplist_sets(a, PA_PROP_MEDIA_ARTIST, "Johann Sebastian Bach") == 0); b = pa_proplist_new(); - pa_assert_se(pa_proplist_puts(b, PA_PROP_MEDIA_TITLE, "Goldbergvariationen") == 0); - pa_assert_se(pa_proplist_put(b, PA_PROP_MEDIA_ICON, "\0\1\2\3\4\5\6\7", 8) == 0); + pa_assert_se(pa_proplist_sets(b, PA_PROP_MEDIA_TITLE, "Goldbergvariationen") == 0); + pa_assert_se(pa_proplist_set(b, PA_PROP_MEDIA_ICON, "\0\1\2\3\4\5\6\7", 8) == 0); - pa_proplist_merge(a, b); + pa_proplist_update(a, PA_UPDATE_MERGE, b); pa_assert_se(!pa_proplist_gets(a, PA_PROP_MEDIA_ICON)); printf("%s\n", pa_strnull(pa_proplist_gets(a, PA_PROP_MEDIA_TITLE))); - pa_assert_se(pa_proplist_remove(b, PA_PROP_MEDIA_TITLE) == 0); + pa_assert_se(pa_proplist_unset(b, PA_PROP_MEDIA_TITLE) == 0); s = pa_proplist_to_string(a); t = pa_proplist_to_string(b); -- cgit