diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-07-25 16:50:57 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-07-25 16:50:57 +0200 |
| commit | 571e728fb0e3982881589c8bb7a54052c5b6acde (patch) | |
| tree | cda08cbcd56204ef794f9bf5bcdd35dd002a1e03 /src/common.c | |
| parent | dd008275f922fea7076aa19479905400946e6707 (diff) | |
| parent | 38d9db9575547ac9354944bd307db752e37601f6 (diff) | |
Merge branch 'gst'
Diffstat (limited to 'src/common.c')
| -rw-r--r-- | src/common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common.c b/src/common.c index 71b887a..260c461 100644 --- a/src/common.c +++ b/src/common.c @@ -532,12 +532,12 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c ca_mutex_lock(c->props->mutex); if ((t = ca_proplist_gets_unlocked(c->props, CA_PROP_CANBERRA_ENABLE))) - enabled = !streq(t, "0"); + enabled = !ca_streq(t, "0"); ca_mutex_unlock(c->props->mutex); ca_mutex_lock(p->mutex); if ((t = ca_proplist_gets_unlocked(p, CA_PROP_CANBERRA_ENABLE))) - enabled = !streq(t, "0"); + enabled = !ca_streq(t, "0"); ca_mutex_unlock(p->mutex); ca_return_val_if_fail_unlock(enabled, CA_ERROR_DISABLED, c->mutex); @@ -703,11 +703,11 @@ int ca_parse_cache_control(ca_cache_control_t *control, const char *c) { ca_return_val_if_fail(control, CA_ERROR_INVALID); ca_return_val_if_fail(c, CA_ERROR_INVALID); - if (streq(c, "never")) + if (ca_streq(c, "never")) *control = CA_CACHE_CONTROL_NEVER; - else if (streq(c, "permanent")) + else if (ca_streq(c, "permanent")) *control = CA_CACHE_CONTROL_PERMANENT; - else if (streq(c, "volatile")) + else if (ca_streq(c, "volatile")) *control = CA_CACHE_CONTROL_VOLATILE; else return CA_ERROR_INVALID; |