From af5da7a37202399a3bc79328e41e22cb101b16f6 Mon Sep 17 00:00:00 2001 From: Julian Bouzas <julian.bouzas@collabora.com> Date: Thu, 7 May 2020 07:50:03 -0400 Subject: [PATCH] src: config: update default wireplumber configuration to work with new config-endpoint module --- src/config/00-audio-sink.endpoint | 4 ++-- src/config/00-audio-source.endpoint | 4 ++-- src/config/00-stream-input-audio.endpoint | 6 +++--- src/config/00-stream-input-video.endpoint | 6 +++--- src/config/00-stream-output-audio.endpoint | 4 ++-- src/config/00-stream-output-video.endpoint | 4 ++-- src/config/00-video-sink.endpoint | 4 ++-- src/config/00-video-source.endpoint | 4 ++-- src/config/01-hw:0,0-audio-sink.endpoint | 6 ++++-- src/config/01-hw:0,0-audio-source.endpoint | 6 ++++-- 10 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/config/00-audio-sink.endpoint b/src/config/00-audio-sink.endpoint index ee55deb6..50088dad 100644 --- a/src/config/00-audio-sink.endpoint +++ b/src/config/00-audio-sink.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -type = "pw-audio-softdsp-endpoint" -direction = "sink" +session = "audio" +type = "si-adapter" diff --git a/src/config/00-audio-source.endpoint b/src/config/00-audio-source.endpoint index b77622f6..18fdfd33 100644 --- a/src/config/00-audio-source.endpoint +++ b/src/config/00-audio-source.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -type = "pw-audio-softdsp-endpoint" -direction = "source" +session = "audio" +type = "si-adapter" diff --git a/src/config/00-stream-input-audio.endpoint b/src/config/00-stream-input-audio.endpoint index 4cea1aa0..e9fe1c30 100644 --- a/src/config/00-stream-input-audio.endpoint +++ b/src/config/00-stream-input-audio.endpoint @@ -1,8 +1,8 @@ [match-node] properties = [ - { name = "media.class", value = "Stream/Input/Video" }, + { name = "media.class", value = "Stream/Input/Audio" }, ] [endpoint] -direction = "sink" -type = "video-endpoint" +session = "audio" +type = "si-adapter" diff --git a/src/config/00-stream-input-video.endpoint b/src/config/00-stream-input-video.endpoint index 0ef2c5b7..c48205d3 100644 --- a/src/config/00-stream-input-video.endpoint +++ b/src/config/00-stream-input-video.endpoint @@ -1,8 +1,8 @@ [match-node] properties = [ - { name = "media.class", value = "Stream/Input/Audio" }, + { name = "media.class", value = "Stream/Input/Video" }, ] [endpoint] -direction = "sink" -type = "pw-audio-softdsp-endpoint" +session = "video" +type = "si-simple-node-endpoint" diff --git a/src/config/00-stream-output-audio.endpoint b/src/config/00-stream-output-audio.endpoint index 4e86323e..7d24349d 100644 --- a/src/config/00-stream-output-audio.endpoint +++ b/src/config/00-stream-output-audio.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -direction = "source" -type = "pw-audio-softdsp-endpoint" +session = "audio" +type = "si-adapter" diff --git a/src/config/00-stream-output-video.endpoint b/src/config/00-stream-output-video.endpoint index f6535f3b..4aef69f9 100644 --- a/src/config/00-stream-output-video.endpoint +++ b/src/config/00-stream-output-video.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -direction = "source" -type = "video-endpoint" +session = "video" +type = "si-simple-node-endpoint" diff --git a/src/config/00-video-sink.endpoint b/src/config/00-video-sink.endpoint index dd2b535a..ff9e6ac0 100644 --- a/src/config/00-video-sink.endpoint +++ b/src/config/00-video-sink.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -type = "video-endpoint" -direction = "sink" +session = "video" +type = "si-simple-node-endpoint" diff --git a/src/config/00-video-source.endpoint b/src/config/00-video-source.endpoint index 71bff4c2..487f7d3f 100644 --- a/src/config/00-video-source.endpoint +++ b/src/config/00-video-source.endpoint @@ -4,5 +4,5 @@ properties = [ ] [endpoint] -type = "video-endpoint" -direction = "source" +session = "video" +type = "si-simple-node-endpoint" diff --git a/src/config/01-hw:0,0-audio-sink.endpoint b/src/config/01-hw:0,0-audio-sink.endpoint index 56a66ede..28d8e307 100644 --- a/src/config/01-hw:0,0-audio-sink.endpoint +++ b/src/config/01-hw:0,0-audio-sink.endpoint @@ -5,6 +5,8 @@ properties = [ ] [endpoint] -type = "pw-audio-softdsp-endpoint" -direction = "sink" +session = "audio" +type = "si-adapter" + +[endpoint.config] priority = 1 diff --git a/src/config/01-hw:0,0-audio-source.endpoint b/src/config/01-hw:0,0-audio-source.endpoint index 671eff82..49ba693a 100644 --- a/src/config/01-hw:0,0-audio-source.endpoint +++ b/src/config/01-hw:0,0-audio-source.endpoint @@ -5,6 +5,8 @@ properties = [ ] [endpoint] -type = "pw-audio-softdsp-endpoint" -direction = "source" +session = "audio" +type = "si-adapter" + +[endpoint.config] priority = 1 -- GitLab