From 63e709d3100b009b196d082ee390f1de12d80f83 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Fri, 12 Mar 2021 18:23:31 +0200 Subject: radio: s/pwaudiosink/pipewiresink/ This is the one and only pipewire sink now. Bug-AGL: SPEC-3844 Signed-off-by: George Kiagiadakis Change-Id: If7c69f9c944f92006bde1aa3b9745b7966501a65 --- binding/radio_impl_kingfisher.c | 4 ++-- binding/radio_impl_tef665x.c | 2 +- binding/radio_output_gstreamer.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binding/radio_impl_kingfisher.c b/binding/radio_impl_kingfisher.c index 92abb11..5fc8a1e 100644 --- a/binding/radio_impl_kingfisher.c +++ b/binding/radio_impl_kingfisher.c @@ -219,7 +219,7 @@ static int kf_init(void) // Use PipeWire output rc = snprintf(gst_pipeline_str, GST_PIPELINE_LEN, - "alsasrc device=hw:radio ! queue ! audioconvert ! audioresample ! pwaudiosink stream-properties=\"p,media.role=Multimedia\""); + "alsasrc device=hw:radio ! queue ! audioconvert ! audioresample ! pipewiresink stream-properties=\"p,media.role=Multimedia\""); if(rc >= GST_PIPELINE_LEN) { AFB_API_ERROR(afbBindingV3root, "pipeline string too long"); return -1; @@ -400,7 +400,7 @@ static void kf_stop(void) // NOTE: Using NULL here instead of READY, as it seems to trigger // some odd behavior in the pipeline; alsasrc does not seem to // stop, and things get hung up on restart as there are a bunch - // of "old" samples that seemingly confuse pwaudiosink. Going + // of "old" samples that seemingly confuse pipewiresink. Going // to NULL state seems to tear down things enough to avoid // whatever happens. gst_element_set_state(pipeline, GST_STATE_NULL); diff --git a/binding/radio_impl_tef665x.c b/binding/radio_impl_tef665x.c index 9bad684..3abcc00 100644 --- a/binding/radio_impl_tef665x.c +++ b/binding/radio_impl_tef665x.c @@ -2148,7 +2148,7 @@ static int tef665x_init() rc = snprintf(gst_pipeline_str, GST_PIPELINE_LEN, "alsasrc device=hw:1,0 ! audioconvert ! audioresample ! audio/x-raw, rate=48000, channels=2 \ - ! pwaudiosink stream-properties=\"p,media.role=Multimedia\" latency-time=35000"); + ! pipewiresink stream-properties=\"p,media.role=Multimedia\""); if(rc >= GST_PIPELINE_LEN) { AFB_ERROR("pipeline string too long"); diff --git a/binding/radio_output_gstreamer.c b/binding/radio_output_gstreamer.c index 5359deb..e098d2d 100644 --- a/binding/radio_output_gstreamer.c +++ b/binding/radio_output_gstreamer.c @@ -65,7 +65,7 @@ int radio_output_open() queue = gst_element_factory_make("queue", "queue"); convert = gst_element_factory_make("audioconvert", "convert"); resample = gst_element_factory_make("audioresample", "resample"); - sink = gst_element_factory_make("pwaudiosink", "sink"); + sink = gst_element_factory_make("pipewiresink", "sink"); if(!(pipeline && appsrc && queue && convert && resample && sink)) { fprintf(stderr, "pipeline element construction failed!\n"); } -- cgit 1.2.3-korg