From eb83f23125a1df7957bfee287e44707bb55c6b40 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 6 Jan 2025 21:28:33 +0100 Subject: [PATCH] MoodbarPipeline: Use bytearray directly --- src/moodbar/moodbarpipeline.cpp | 18 +++++++++--------- src/moodbar/moodbarpipeline.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp index f11751d82..0851c3dd6 100644 --- a/src/moodbar/moodbarpipeline.cpp +++ b/src/moodbar/moodbarpipeline.cpp @@ -62,18 +62,18 @@ MoodbarPipeline::~MoodbarPipeline() { } -GstElement *MoodbarPipeline::CreateElement(const QString &factory_name) { +GstElement *MoodbarPipeline::CreateElement(const QByteArray &factory_name) { - GstElement *ret = gst_element_factory_make(factory_name.toLatin1().constData(), nullptr); + GstElement *element = gst_element_factory_make(factory_name.constData(), nullptr); - if (ret) { - gst_bin_add(GST_BIN(pipeline_), ret); + if (element) { + gst_bin_add(GST_BIN(pipeline_), element); } else { qLog(Warning) << "Unable to create gstreamer element" << factory_name; } - return ret; + return element; } @@ -100,10 +100,10 @@ void MoodbarPipeline::Start() { pipeline_ = gst_pipeline_new("moodbar-pipeline"); - GstElement *decodebin = CreateElement(u"uridecodebin"_s); - convert_element_ = CreateElement(u"audioconvert"_s); - GstElement *spectrum = CreateElement(u"strawberry-fastspectrum"_s); - GstElement *fakesink = CreateElement(u"fakesink"_s); + GstElement *decodebin = CreateElement("uridecodebin"); + convert_element_ = CreateElement("audioconvert"); + GstElement *spectrum = CreateElement("strawberry-fastspectrum"); + GstElement *fakesink = CreateElement("fakesink"); if (!decodebin || !convert_element_ || !spectrum || !fakesink) { gst_object_unref(GST_OBJECT(pipeline_)); diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index d24367f02..ff9923c2b 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -54,7 +54,7 @@ class MoodbarPipeline : public QObject { void Finished(const bool success); private: - GstElement *CreateElement(const QString &factory_name); + GstElement *CreateElement(const QByteArray &factory_name); QByteArray ToGstUrl(const QUrl &url); void ReportError(GstMessage *msg);