diff --git a/src/examples/media-session/default-nodes.c b/src/examples/media-session/default-nodes.c index d56c51d28..769bc5a5f 100644 --- a/src/examples/media-session/default-nodes.c +++ b/src/examples/media-session/default-nodes.c @@ -129,7 +129,7 @@ static void remove_idle_timeout(struct impl *impl) if (impl->idle_timeout) { if ((res = sm_media_session_save_state(impl->session, - SESSION_KEY, PREFIX, impl->properties)) < 0) + SESSION_KEY, impl->properties)) < 0) pw_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res)); pw_loop_destroy_source(main_loop, impl->idle_timeout); impl->idle_timeout = NULL; @@ -295,7 +295,7 @@ int sm_default_nodes_start(struct sm_media_session *session) } if ((res = sm_media_session_load_state(impl->session, - SESSION_KEY, PREFIX, impl->properties)) < 0) + SESSION_KEY, impl->properties)) < 0) pw_log_info("can't load "SESSION_KEY" state: %s", spa_strerror(res)); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl); diff --git a/src/examples/media-session/default-profile.c b/src/examples/media-session/default-profile.c index 01121ad24..dc33c081d 100644 --- a/src/examples/media-session/default-profile.c +++ b/src/examples/media-session/default-profile.c @@ -87,7 +87,7 @@ static void remove_idle_timeout(struct impl *impl) if (impl->idle_timeout) { if ((res = sm_media_session_save_state(impl->session, - SESSION_KEY, PREFIX, impl->properties)) < 0) + SESSION_KEY, impl->properties)) < 0) pw_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res)); pw_loop_destroy_source(main_loop, impl->idle_timeout); impl->idle_timeout = NULL; @@ -420,7 +420,7 @@ int sm_default_profile_start(struct sm_media_session *session) } if ((res = sm_media_session_load_state(impl->session, - SESSION_KEY, PREFIX, impl->properties)) < 0) + SESSION_KEY, impl->properties)) < 0) pw_log_info("can't load "SESSION_KEY" state: %s", spa_strerror(res)); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl); diff --git a/src/examples/media-session/default-routes.c b/src/examples/media-session/default-routes.c index 2223e0536..b39161cfd 100644 --- a/src/examples/media-session/default-routes.c +++ b/src/examples/media-session/default-routes.c @@ -87,7 +87,7 @@ static void remove_idle_timeout(struct impl *impl) if (impl->idle_timeout) { if ((res = sm_media_session_save_state(impl->session, - SESSION_KEY, PREFIX, impl->to_restore)) < 0) + SESSION_KEY, impl->to_restore)) < 0) pw_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res)); pw_loop_destroy_source(main_loop, impl->idle_timeout); impl->idle_timeout = NULL; @@ -988,7 +988,7 @@ int sm_default_routes_start(struct sm_media_session *session) } if ((res = sm_media_session_load_state(impl->session, - SESSION_KEY, PREFIX, impl->to_restore)) < 0) + SESSION_KEY, impl->to_restore)) < 0) pw_log_info("can't load "SESSION_KEY" state: %s", spa_strerror(res)); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl); diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 52c633e25..4cc802ce8 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -1787,13 +1787,13 @@ int sm_media_session_load_conf(struct sm_media_session *sess, const char *name, } int sm_media_session_load_state(struct sm_media_session *sess, - const char *name, const char *prefix, struct pw_properties *props) + const char *name, struct pw_properties *props) { return pw_conf_load_state(SESSION_PREFIX, name, props); } int sm_media_session_save_state(struct sm_media_session *sess, - const char *name, const char *prefix, const struct pw_properties *props) + const char *name, const struct pw_properties *props) { return pw_conf_save_state(SESSION_PREFIX, name, props); } diff --git a/src/examples/media-session/media-session.h b/src/examples/media-session/media-session.h index b530e798d..64b2827d8 100644 --- a/src/examples/media-session/media-session.h +++ b/src/examples/media-session/media-session.h @@ -293,9 +293,9 @@ int sm_media_session_load_conf(struct sm_media_session *sess, const char *name, struct pw_properties *conf); int sm_media_session_load_state(struct sm_media_session *sess, - const char *name, const char *prefix, struct pw_properties *props); + const char *name, struct pw_properties *props); int sm_media_session_save_state(struct sm_media_session *sess, - const char *name, const char *prefix, const struct pw_properties *props); + const char *name, const struct pw_properties *props); int sm_media_session_match_rules(const char *rules, size_t size, struct pw_properties *props); diff --git a/src/examples/media-session/restore-stream.c b/src/examples/media-session/restore-stream.c index 9e2abad8f..47e23deec 100644 --- a/src/examples/media-session/restore-stream.c +++ b/src/examples/media-session/restore-stream.c @@ -86,7 +86,7 @@ static void remove_idle_timeout(struct impl *impl) if (impl->idle_timeout) { if ((res = sm_media_session_save_state(impl->session, - SESSION_KEY, PREFIX, impl->props)) < 0) + SESSION_KEY, impl->props)) < 0) pw_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res)); pw_loop_destroy_source(main_loop, impl->idle_timeout); impl->idle_timeout = NULL; @@ -524,7 +524,7 @@ int sm_restore_stream_start(struct sm_media_session *session) &metadata_events, impl); if ((res = sm_media_session_load_state(impl->session, - SESSION_KEY, PREFIX, impl->props)) < 0) + SESSION_KEY, impl->props)) < 0) pw_log_info("can't load "SESSION_KEY" state: %s", spa_strerror(res)); sync_metadata(impl);