mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: remove unused prefix from load/save state

Browse source 
The prefix was used to filter the properties when loading and
saving but since the conversion to the core provided functions, this
feature is not longer available.

It's not exactly a problem, we could implement the filtering ourselves
afterwards but there is little point because we just ignore the unknown
items and never write invalid items.
This commit is contained in:
Wim Taymans 2021-03-05 09:23:19 +01:00
parent e89e87ba94
commit 93002ecd11
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/examples/media-session/default-nodes.c
View file

@ -129,7 +129,7 @@ static void remove_idle_timeout(struct impl *impl)
if (impl->idle_timeout) { if (impl->idle_timeout) {
if ((res = sm_media_session_save_state(impl->session, 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_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res));
pw_loop_destroy_source(main_loop, impl->idle_timeout); pw_loop_destroy_source(main_loop, impl->idle_timeout);
impl->idle_timeout = NULL; 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, 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)); 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); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl);

4
src/examples/media-session/default-profile.c
View file

@ -87,7 +87,7 @@ static void remove_idle_timeout(struct impl *impl)
if (impl->idle_timeout) { if (impl->idle_timeout) {
if ((res = sm_media_session_save_state(impl->session, 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_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res));
pw_loop_destroy_source(main_loop, impl->idle_timeout); pw_loop_destroy_source(main_loop, impl->idle_timeout);
impl->idle_timeout = NULL; 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, 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)); 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); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl);

4
src/examples/media-session/default-routes.c
View file

@ -87,7 +87,7 @@ static void remove_idle_timeout(struct impl *impl)
if (impl->idle_timeout) { if (impl->idle_timeout) {
if ((res = sm_media_session_save_state(impl->session, 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_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res));
pw_loop_destroy_source(main_loop, impl->idle_timeout); pw_loop_destroy_source(main_loop, impl->idle_timeout);
impl->idle_timeout = NULL; 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, 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)); 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); sm_media_session_add_listener(impl->session, &impl->listener, &session_events, impl);

4
src/examples/media-session/media-session.c
View file

@ -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, 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); return pw_conf_load_state(SESSION_PREFIX, name, props);
} }
int sm_media_session_save_state(struct sm_media_session *sess, 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); return pw_conf_save_state(SESSION_PREFIX, name, props);
} }

4
src/examples/media-session/media-session.h
View file

@ -293,9 +293,9 @@ int sm_media_session_load_conf(struct sm_media_session *sess,
const char *name, struct pw_properties *conf); const char *name, struct pw_properties *conf);
int sm_media_session_load_state(struct sm_media_session *sess, 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, 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, int sm_media_session_match_rules(const char *rules, size_t size,
struct pw_properties *props); struct pw_properties *props);

4
src/examples/media-session/restore-stream.c
View file

@ -86,7 +86,7 @@ static void remove_idle_timeout(struct impl *impl)
if (impl->idle_timeout) { if (impl->idle_timeout) {
if ((res = sm_media_session_save_state(impl->session, 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_log_error("can't save "SESSION_KEY" state: %s", spa_strerror(res));
pw_loop_destroy_source(main_loop, impl->idle_timeout); pw_loop_destroy_source(main_loop, impl->idle_timeout);
impl->idle_timeout = NULL; impl->idle_timeout = NULL;
@ -524,7 +524,7 @@ int sm_restore_stream_start(struct sm_media_session *session)
&metadata_events, impl); &metadata_events, impl);
if ((res = sm_media_session_load_state(impl->session, 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)); pw_log_info("can't load "SESSION_KEY" state: %s", spa_strerror(res));
sync_metadata(impl); sync_metadata(impl);