diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2019-12-16 11:46:52 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2019-12-16 11:57:58 +0100 |
| commit | 2242c4bab2e0f00b6ff023e3b4e490482a03104f (patch) | |
| tree | e67333627c02750cc0f6623b0781ff97d0d6cfc0 | |
| parent | 5cfb155827987cb39762dc011cfd0370e16b6ac9 (diff) | |
stream-monitor -> stream-endpoint
| -rw-r--r-- | src/examples/media-session/media-session.c | 4 | ||||
| -rw-r--r-- | src/examples/media-session/stream-endpoint.c (renamed from src/examples/media-session/stream-monitor.c) | 8 | ||||
| -rw-r--r-- | src/examples/meson.build | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 1d4b4034..6b6298a3 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -58,7 +58,7 @@ #define sm_media_session_emit_remove(s,obj) sm_media_session_emit(s, remove, 0, obj) #define sm_media_session_emit_rescan(s,seq) sm_media_session_emit(s, rescan, 0, seq) -void * sm_stream_monitor_start(struct sm_media_session *sess); +void * sm_stream_endpoint_start(struct sm_media_session *sess); void * sm_metadata_start(struct sm_media_session *sess); void * sm_alsa_midi_start(struct sm_media_session *sess); void * sm_v4l2_monitor_start(struct sm_media_session *sess); @@ -1517,7 +1517,7 @@ static void proxy_client_session_bound(void *data, uint32_t id) sm_alsa_monitor_start(&impl->this); sm_alsa_endpoint_start(&impl->this); sm_v4l2_monitor_start(&impl->this); - sm_stream_monitor_start(&impl->this); + sm_stream_endpoint_start(&impl->this); } static const struct pw_proxy_events proxy_client_session_events = { diff --git a/src/examples/media-session/stream-monitor.c b/src/examples/media-session/stream-endpoint.c index 6a69b047..f019899e 100644 --- a/src/examples/media-session/stream-monitor.c +++ b/src/examples/media-session/stream-endpoint.c @@ -41,8 +41,8 @@ #include "extensions/session-manager.h" #include "media-session.h" -#define NAME "stream-monitor" -#define SESSION_KEY "stream-monitor" +#define NAME "stream-endpoint" +#define SESSION_KEY "stream-endpoint" #define DEFAULT_CHANNELS 2 #define DEFAULT_SAMPLERATE 48000 @@ -578,7 +578,7 @@ static const struct sm_media_session_events session_events = { .remove = session_remove, }; -void * sm_stream_monitor_start(struct sm_media_session *session) +void * sm_stream_endpoint_start(struct sm_media_session *session) { struct impl *impl; @@ -592,7 +592,7 @@ void * sm_stream_monitor_start(struct sm_media_session *session) return impl; } -int sm_stream_monitor_stop(void *data) +int sm_stream_endpoint_stop(void *data) { struct impl *impl = data; spa_hook_remove(&impl->listener); diff --git a/src/examples/meson.build b/src/examples/meson.build index 86ca8618..ddfb202b 100644 --- a/src/examples/meson.build +++ b/src/examples/meson.build @@ -51,7 +51,7 @@ executable('media-session', 'media-session/bluez-monitor.c', 'media-session/media-session.c', 'media-session/metadata.c', - 'media-session/stream-monitor.c', + 'media-session/stream-endpoint.c', 'media-session/policy-ep.c', 'media-session/v4l2-monitor.c', c_args : [ '-D_GNU_SOURCE' ], |