dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QStringLiteral with QLatin1String

Browse Source
This commit is contained in:
Jonas Kvinge
2024-06-12 20:30:36 +02:00
parent 20595a11bc
commit 5451c110b1
64 changed files with 367 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/ebur128analysis.cpp
View File

@@ -216,16 +216,16 @@ FrameFormat::FrameFormat(GstCaps *caps) : channels(0), channel_mask(0), samplera
channel_mask = gst_value_get_bitmask(value);
}
if (format_str == QStringLiteral("S16LE")) {
if (format_str == QLatin1String("S16LE")) {
format = DataFormat::S16;
}
else if (format_str == QStringLiteral("S32LE")) {
else if (format_str == QLatin1String("S32LE")) {
format = DataFormat::S32;
}
else if (format_str == QStringLiteral("F32LE")) {
else if (format_str == QLatin1String("F32LE")) {
format = DataFormat::FP32;
}
else if (format_str == QStringLiteral("F64LE")) {
else if (format_str == QLatin1String("F64LE")) {
format = DataFormat::FP64;
}
else {

26
src/engine/gstengine.cpp
View File

@@ -418,23 +418,23 @@ EngineBase::OutputDetailsList GstEngine::GetOutputsList() const {
const QString metadata = QString::fromUtf8(gst_element_factory_get_metadata(factory, GST_ELEMENT_METADATA_KLASS));
const QString name = QString::fromUtf8(gst_plugin_feature_get_name(future->data));
const QStringList classes = metadata.split(QLatin1Char('/'));
if (classes.contains(QStringLiteral("Audio"), Qt::CaseInsensitive) && (classes.contains(QStringLiteral("Sink"), Qt::CaseInsensitive) || (classes.contains(QStringLiteral("Source"), Qt::CaseInsensitive) && name.contains(QStringLiteral("sink"))))) {
if (classes.contains(QLatin1String("Audio"), Qt::CaseInsensitive) && (classes.contains(QLatin1String("Sink"), Qt::CaseInsensitive) || (classes.contains(QLatin1String("Source"), Qt::CaseInsensitive) && name.contains(QLatin1String("sink"))))) {
QString description = QString::fromUtf8(gst_element_factory_get_metadata(factory, GST_ELEMENT_METADATA_DESCRIPTION));
if (name == QStringLiteral("wasapi2sink") && description == QStringLiteral("Stream audio to an audio capture device through WASAPI")) {
if (name == QLatin1String("wasapi2sink") && description == QLatin1String("Stream audio to an audio capture device through WASAPI")) {
description.append(QLatin1Char('2'));
}
else if (name == QStringLiteral("pipewiresink") && description == QStringLiteral("Send video to PipeWire")) {
description = QStringLiteral("Send audio to PipeWire");
else if (name == QLatin1String("pipewiresink") && description == QLatin1String("Send video to PipeWire")) {
description = QLatin1String("Send audio to PipeWire");
}
OutputDetails output;
output.name = name;
output.description = description;
if (output.name == QLatin1String(kAutoSink)) output.iconname = QStringLiteral("soundcard");
else if (output.name == QLatin1String(kALSASink) || output.name == QLatin1String(kOSS4Sink)) output.iconname = QStringLiteral("alsa");
else if (output.name == QLatin1String(kJackAudioSink)) output.iconname = QStringLiteral("jack");
else if (output.name == QLatin1String(kPulseSink)) output.iconname = QStringLiteral("pulseaudio");
else if (output.name == QLatin1String(kA2DPSink) || output.name == QLatin1String(kAVDTPSink)) output.iconname = QStringLiteral("bluetooth");
else output.iconname = QStringLiteral("soundcard");
if (output.name == QLatin1String(kAutoSink)) output.iconname = QLatin1String("soundcard");
else if (output.name == QLatin1String(kALSASink) || output.name == QLatin1String(kOSS4Sink)) output.iconname = QLatin1String("alsa");
else if (output.name == QLatin1String(kJackAudioSink)) output.iconname = QLatin1String("jack");
else if (output.name == QLatin1String(kPulseSink)) output.iconname = QLatin1String("pulseaudio");
else if (output.name == QLatin1String(kA2DPSink) || output.name == QLatin1String(kAVDTPSink)) output.iconname = QLatin1String("bluetooth");
else output.iconname = QLatin1String("soundcard");
outputs << output;
}
}
@@ -724,10 +724,10 @@ QByteArray GstEngine::FixupUrl(const QUrl &url) {
// QUrl::fromLocalFile does this when given a \\host\share\file path on Windows.
// Munge it back into a path that gstreamer will recognise.
if (url.isLocalFile() && !url.host().isEmpty()) {
QString str = QStringLiteral("file:////") + url.host() + url.path();
QString str = QLatin1String("file:////") + url.host() + url.path();
uri = str.toUtf8();
}
else if (url.scheme() == QStringLiteral("cdda")) {
else if (url.scheme() == QLatin1String("cdda")) {
QString str;
if (url.path().isEmpty()) {
str = url.toString();
@@ -952,7 +952,7 @@ void GstEngine::StreamDiscovered(GstDiscoverer*, GstDiscovererInfo *info, GError
GstStructure *gst_structure = gst_caps_get_structure(caps, i);
if (!gst_structure) continue;
QString mimetype = QString::fromUtf8(gst_structure_get_name(gst_structure));
if (!mimetype.isEmpty() && mimetype != QStringLiteral("audio/mpeg")) {
if (!mimetype.isEmpty() && mimetype != QLatin1String("audio/mpeg")) {
engine_metadata.filetype = Song::FiletypeByMimetype(mimetype);
if (engine_metadata.filetype == Song::FileType::Unknown) {
qLog(Error) << "Unknown mimetype" << mimetype;

28
src/engine/gstenginepipeline.cpp
View File

@@ -321,7 +321,7 @@ QString GstEnginePipeline::GstStateText(const GstState state) {
GstElement *GstEnginePipeline::CreateElement(const QString &factory_name, const QString &name, GstElement *bin, QString &error) const {
QString unique_name = QStringLiteral("pipeline") + QLatin1Char('-') + QString::number(id_) + QLatin1Char('-') + (name.isEmpty() ? factory_name : name);
QString unique_name = QLatin1String("pipeline") + QLatin1Char('-') + QString::number(id_) + QLatin1Char('-') + (name.isEmpty() ? factory_name : name);
GstElement *element = gst_element_factory_make(factory_name.toUtf8().constData(), unique_name.toUtf8().constData());
if (!element) {
@@ -751,7 +751,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
// Link replaygain elements if enabled.
if (rg_enabled_ && rgvolume && rglimiter && rgconverter) {
if (!gst_element_link_many(element_link, rgvolume, rglimiter, rgconverter, nullptr)) {
error = QStringLiteral("Failed to link replaygain volume, limiter and converter elements.");
error = QLatin1String("Failed to link replaygain volume, limiter and converter elements.");
return false;
}
element_link = rgconverter;
@@ -764,7 +764,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
"format = (string) { F32LE, F64LE }");
GstCaps *raw_fp_audio_caps = gst_static_caps_get(&static_raw_fp_audio_caps);
if (!gst_element_link_filtered(element_link, volume_ebur128_, raw_fp_audio_caps)) {
error = QStringLiteral("Failed to link EBU R 128 volume element.");
error = QLatin1String("Failed to link EBU R 128 volume element.");
return false;
}
gst_caps_unref(raw_fp_audio_caps);
@@ -774,7 +774,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
// Link equalizer elements if enabled.
if (eq_enabled_ && equalizer_ && equalizer_preamp_) {
if (!gst_element_link_many(element_link, equalizer_preamp_, equalizer_, nullptr)) {
error = QStringLiteral("Failed to link equalizer and equalizer preamp elements.");
error = QLatin1String("Failed to link equalizer and equalizer preamp elements.");
return false;
}
element_link = equalizer_;
@@ -783,7 +783,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
// Link stereo balancer elements if enabled.
if (stereo_balancer_enabled_ && audiopanorama_) {
if (!gst_element_link(element_link, audiopanorama_)) {
error = QStringLiteral("Failed to link audio panorama (stereo balancer).");
error = QLatin1String("Failed to link audio panorama (stereo balancer).");
return false;
}
element_link = audiopanorama_;
@@ -792,7 +792,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
// Link software volume element if enabled.
if (volume_enabled_ && volume_sw_) {
if (!gst_element_link(element_link, volume_sw_)) {
error = QStringLiteral("Failed to link software volume.");
error = QLatin1String("Failed to link software volume.");
return false;
}
element_link = volume_sw_;
@@ -801,7 +801,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
// Link fading volume element if enabled.
if (fading_enabled_ && volume_fading_) {
if (!gst_element_link(element_link, volume_fading_)) {
error = QStringLiteral("Failed to link fading volume.");
error = QLatin1String("Failed to link fading volume.");
return false;
}
element_link = volume_fading_;
@@ -811,21 +811,21 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
if (bs2b_enabled_ && bs2b) {
qLog(Debug) << "Enabling bs2b";
if (!gst_element_link(element_link, bs2b)) {
error = QStringLiteral("Failed to link bs2b.");
error = QLatin1String("Failed to link bs2b.");
return false;
}
element_link = bs2b;
}
if (!gst_element_link(element_link, audiosinkconverter)) {
error = QStringLiteral("Failed to link audio sink converter.");
error = QLatin1String("Failed to link audio sink converter.");
return false;
}
{
GstCaps *caps = gst_caps_new_empty_simple("audio/x-raw");
if (!caps) {
error = QStringLiteral("Failed to create caps for raw audio.");
error = QLatin1String("Failed to create caps for raw audio.");
return false;
}
if (channels_enabled_ && channels_ > 0) {
@@ -835,7 +835,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
const bool link_filtered_result = gst_element_link_filtered(audiosinkconverter, audiosink_, caps);
gst_caps_unref(caps);
if (!link_filtered_result) {
error = QStringLiteral("Failed to link audio sink converter to audio sink with filter for ") + output_;
error = QLatin1String("Failed to link audio sink converter to audio sink with filter for ") + output_;
return false;
}
}
@@ -926,7 +926,7 @@ void GstEnginePipeline::ElementAddedCallback(GstBin *bin, GstBin*, GstElement *e
const QString element_name = QString::fromUtf8(element_name_char);
g_free(element_name_char);
if (bin != GST_BIN(instance->audiobin_) || element_name == QStringLiteral("fake-audio-sink") || GST_ELEMENT(gst_element_get_parent(element)) != instance->audiosink_) return;
if (bin != GST_BIN(instance->audiobin_) || element_name == QLatin1String("fake-audio-sink") || GST_ELEMENT(gst_element_get_parent(element)) != instance->audiosink_) return;
GstElement *volume = nullptr;
if (GST_IS_STREAM_VOLUME(element)) {
@@ -1456,7 +1456,7 @@ void GstEnginePipeline::ErrorMessageReceived(GstMessage *msg) {
#ifdef Q_OS_WIN
// Ignore non-error received for directsoundsink: "IDirectSoundBuffer_GetStatus The operation completed successfully"
if (code == GST_RESOURCE_ERROR_OPEN_WRITE && message.contains(QStringLiteral("IDirectSoundBuffer_GetStatus The operation completed successfully."))) {
if (code == GST_RESOURCE_ERROR_OPEN_WRITE && message.contains(QLatin1String("IDirectSoundBuffer_GetStatus The operation completed successfully."))) {
return;
}
#endif
@@ -1486,7 +1486,7 @@ void GstEnginePipeline::TagMessageReceived(GstMessage *msg) {
if (!engine_metadata.title.isEmpty() && engine_metadata.artist.isEmpty() && engine_metadata.album.isEmpty()) {
QStringList title_splitted;
if (engine_metadata.title.contains(QLatin1String(" - "))) {
title_splitted = engine_metadata.title.split(QStringLiteral(" - "));
title_splitted = engine_metadata.title.split(QLatin1String(" - "));
}
else if (engine_metadata.title.contains(QLatin1Char('~'))) {
title_splitted = engine_metadata.title.split(QLatin1Char('~'));

12
src/engine/gststartup.cpp
View File

@@ -115,28 +115,28 @@ void GstStartup::SetEnvironment() {
// Set plugin root path
QString plugin_root_path;
# if defined(Q_OS_MACOS)
plugin_root_path = QDir::cleanPath(app_path + QStringLiteral("/../PlugIns"));
plugin_root_path = QDir::cleanPath(app_path + QLatin1String("/../PlugIns"));
# elif defined(Q_OS_UNIX)
plugin_root_path = QDir::cleanPath(app_path + QStringLiteral("/../plugins"));
plugin_root_path = QDir::cleanPath(app_path + QLatin1String("/../plugins"));
# elif defined(Q_OS_WIN32)
plugin_root_path = app_path;
# endif
// Set GIO module path
const QString gio_module_path = plugin_root_path + QStringLiteral("/gio-modules");
const QString gio_module_path = plugin_root_path + QLatin1String("/gio-modules");
// Set GStreamer plugin scanner path
QString gst_plugin_scanner;
# if defined(Q_OS_UNIX)
gst_plugin_scanner = plugin_root_path + QStringLiteral("/gst-plugin-scanner");
gst_plugin_scanner = plugin_root_path + QLatin1String("/gst-plugin-scanner");
# endif
// Set GStreamer plugin path
QString gst_plugin_path;
# if defined(Q_OS_WIN32)
gst_plugin_path = plugin_root_path + QStringLiteral("/gstreamer-plugins");
gst_plugin_path = plugin_root_path + QLatin1String("/gstreamer-plugins");
# else
gst_plugin_path = plugin_root_path + QStringLiteral("/gstreamer");
gst_plugin_path = plugin_root_path + QLatin1String("/gstreamer");
# endif
if (!gio_module_path.isEmpty()) {

2
src/engine/macosdevicefinder.cpp
View File

@@ -107,7 +107,7 @@ EngineDeviceList MacOsDeviceFinder::ListDevices() {
EngineDevice device;
device.value = id;
device.description = QString::fromUtf8(CFStringGetCStringPtr(*device_name, CFStringGetSystemEncoding()));
if (device.description.isEmpty()) device.description = QStringLiteral("Unknown device ") + device.value.toString();
if (device.description.isEmpty()) device.description = QLatin1String("Unknown device ") + device.value.toString();
device.iconname = device.GuessIconName();
device_list.append(device);
}

2
src/engine/mmdevicefinder.cpp
View File

@@ -49,7 +49,7 @@ EngineDeviceList MMDeviceFinder::ListDevices() {
EngineDeviceList devices;
EngineDevice default_device;
default_device.description = QStringLiteral("Default device");
default_device.description = QLatin1String("Default device");
default_device.iconname = default_device.GuessIconName();
devices.append(default_device);

22
src/engine/vlcengine.cpp
View File

@@ -129,7 +129,7 @@ bool VLCEngine::Play(const quint64 offset_nanosec) {
if (!Initialized()) return false;
// Set audio output
if (!output_.isEmpty() && output_ != QStringLiteral("auto")) {
if (!output_.isEmpty() && output_ != QLatin1String("auto")) {
int result = libvlc_audio_output_set(player_, output_.toUtf8().constData());
if (result != 0) qLog(Error) << "Failed to set output to" << output_;
}
@@ -225,8 +225,8 @@ EngineBase::OutputDetailsList VLCEngine::GetOutputsList() const {
OutputDetailsList outputs;
OutputDetails output_auto;
output_auto.name = QStringLiteral("auto");
output_auto.description = QStringLiteral("Automatically detected");
output_auto.name = QLatin1String("auto");
output_auto.description = QLatin1String("Automatically detected");
outputs << output_auto;
libvlc_audio_output_t *audio_output_list = libvlc_audio_output_list_get(instance_);
@@ -234,12 +234,12 @@ EngineBase::OutputDetailsList VLCEngine::GetOutputsList() const {
OutputDetails output;
output.name = QString::fromUtf8(audio_output->psz_name);
output.description = QString::fromUtf8(audio_output->psz_description);
if (output.name == QStringLiteral("auto")) output.iconname = QStringLiteral("soundcard");
else if ((output.name == QStringLiteral("alsa"))||(output.name == QStringLiteral("oss"))) output.iconname = QStringLiteral("alsa");
else if (output.name== QStringLiteral("jack")) output.iconname = QStringLiteral("jack");
else if (output.name == QStringLiteral("pulse")) output.iconname = QStringLiteral("pulseaudio");
else if (output.name == QStringLiteral("afile")) output.iconname = QStringLiteral("document-new");
else output.iconname = QStringLiteral("soundcard");
if (output.name == QLatin1String("auto")) output.iconname = QLatin1String("soundcard");
else if ((output.name == QLatin1String("alsa"))||(output.name == QLatin1String("oss"))) output.iconname = QLatin1String("alsa");
else if (output.name== QLatin1String("jack")) output.iconname = QLatin1String("jack");
else if (output.name == QLatin1String("pulse")) output.iconname = QLatin1String("pulseaudio");
else if (output.name == QLatin1String("afile")) output.iconname = QLatin1String("document-new");
else output.iconname = QLatin1String("soundcard");
outputs << output;
}
libvlc_audio_output_list_release(audio_output_list);
@@ -256,11 +256,11 @@ bool VLCEngine::ValidOutput(const QString &output) {
}
bool VLCEngine::CustomDeviceSupport(const QString &output) {
return (output != QStringLiteral("auto"));
return (output != QLatin1String("auto"));
}
bool VLCEngine::ALSADeviceSupport(const QString &output) {
return (output == QStringLiteral("alsa"));
return (output == QLatin1String("alsa"));
}
bool VLCEngine::ExclusiveModeSupport(const QString &output) {