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

Replace QLatin1String with operator _L1

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-07 04:24:14 +02:00
parent e3e6a22172
commit 4270b12cd1
185 changed files with 2429 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/transcoder/transcodedialog.cpp
View File

@@ -67,6 +67,8 @@
#include "ui_transcodedialog.h"
#include "ui_transcodelogdialog.h"
using namespace Qt::StringLiterals;
// winspool.h defines this :(
#ifdef AddJob
# undef AddJob
@@ -315,7 +317,7 @@ void TranscodeDialog::UpdateStatusText() {
sections << QStringLiteral("<font color=\"#b60000\">") + tr("%n failed", "", finished_failed_) + QStringLiteral("</font>");
}
ui_->progress_text->setText(sections.join(QLatin1String(", ")));
ui_->progress_text->setText(sections.join(", "_L1));
}
@@ -349,7 +351,7 @@ void TranscodeDialog::Import() {
QStringList filenames;
const QStringList audio_types = QString::fromLatin1(FileView::kFileFilter).split(QLatin1Char(' '), Qt::SkipEmptyParts);
const QStringList audio_types = QString::fromLatin1(FileView::kFileFilter).split(u' ', Qt::SkipEmptyParts);
QDirIterator files(path, audio_types, QDir::Files | QDir::Readable, QDirIterator::Subdirectories);
while (files.hasNext()) {
@@ -369,8 +371,8 @@ void TranscodeDialog::Import() {
void TranscodeDialog::SetFilenames(const QStringList &filenames) {
for (const QString &filename : filenames) {
QString name = filename.section(QLatin1Char('/'), -1, -1);
QString path = filename.section(QLatin1Char('/'), 0, -2);
QString name = filename.section(u'/', -1, -1);
QString path = filename.section(u'/', 0, -2);
QTreeWidgetItem *item = new QTreeWidgetItem(ui_->files, QStringList() << name << path);
item->setData(0, Qt::UserRole, filename);
@@ -438,7 +440,7 @@ void TranscodeDialog::AddDestination() {
// Returns the rightmost non-empty part of 'path'.
QString TranscodeDialog::TrimPath(const QString &path) {
return path.section(QLatin1Char('/'), -1, -1, QString::SectionSkipEmpty);
return path.section(u'/', -1, -1, QString::SectionSkipEmpty);
}
QString TranscodeDialog::GetOutputFileName(const QString &input_filepath, const TranscoderPreset &preset) const {
@@ -451,7 +453,7 @@ QString TranscodeDialog::GetOutputFileName(const QString &input_filepath, const
}
else {
QString filename = TrimPath(input_filepath);
filename = filename.section(QLatin1Char('.'), 0, -2);
filename = filename.section(u'.', 0, -2);
output_filepath = destination_path + QLatin1Char('/') + filename + QLatin1Char('.') + preset.extension_;
}

15
src/transcoder/transcoder.cpp
View File

@@ -48,6 +48,7 @@
#include "core/settings.h"
#include "transcoder.h"
using namespace Qt::StringLiterals;
using std::make_shared;
int Transcoder::JobFinishedEvent::sEventType = -1;
@@ -95,8 +96,8 @@ GstElement *Transcoder::CreateElementForMimeType(GstElementFactoryListType eleme
if (mime_type.isEmpty()) return nullptr;
// HACK: Force mp4mux because it doesn't set any useful src caps
if (mime_type == QLatin1String("audio/mp4")) {
Q_EMIT LogLine(QStringLiteral("Using '%1' (rank %2)").arg(QLatin1String("mp4mux")).arg(-1));
if (mime_type == "audio/mp4"_L1) {
Q_EMIT LogLine(QStringLiteral("Using '%1' (rank %2)").arg("mp4mux"_L1).arg(-1));
return CreateElement(QStringLiteral("mp4mux"), bin);
}
@@ -118,7 +119,7 @@ GstElement *Transcoder::CreateElementForMimeType(GstElementFactoryListType eleme
if (gst_element_factory_can_src_any_caps(factory, target_caps)) {
const QString name = QString::fromUtf8(GST_OBJECT_NAME(factory));
int rank = static_cast<int>(gst_plugin_feature_get_rank(GST_PLUGIN_FEATURE(factory)));
if (name.startsWith(QLatin1String("avmux")) || name.startsWith(QLatin1String("avenc"))) {
if (name.startsWith("avmux"_L1) || name.startsWith("avenc"_L1)) {
rank = -1; // ffmpeg usually sucks
}
suitable_elements_ << SuitableElement(name, rank);
@@ -137,7 +138,7 @@ GstElement *Transcoder::CreateElementForMimeType(GstElementFactoryListType eleme
Q_EMIT LogLine(QStringLiteral("Using '%1' (rank %2)").arg(best.name_).arg(best.rank_));
if (best.name_ == QLatin1String("lamemp3enc")) {
if (best.name_ == "lamemp3enc"_L1) {
// Special case: we need to add xingmux and id3v2mux to the pipeline when using lamemp3enc because it doesn't write the VBR or ID3v2 headers itself.
Q_EMIT LogLine(QStringLiteral("Adding xingmux and id3v2mux to the pipeline"));
@@ -198,7 +199,7 @@ Transcoder::Transcoder(QObject *parent, const QString &settings_postfix)
// Initialize some settings for the lamemp3enc element.
Settings s;
s.beginGroup(QLatin1String("Transcoder/lamemp3enc") + settings_postfix_);
s.beginGroup("Transcoder/lamemp3enc"_L1 + settings_postfix_);
if (s.value("target").isNull()) {
s.setValue("target", 1); // 1 == bitrate
@@ -282,7 +283,7 @@ QString Transcoder::GetFile(const QString &input, const TranscoderPreset &preset
if (!fileinfo_output.isFile() || fileinfo_output.filePath().isEmpty() || fileinfo_output.path().isEmpty() || fileinfo_output.fileName().isEmpty() || fileinfo_output.suffix().isEmpty()) {
QFileInfo fileinfo_input(input);
QString temp_dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/transcoder");
QString temp_dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/transcoder"_L1;
if (!QDir(temp_dir).exists()) QDir().mkpath(temp_dir);
QString filename = fileinfo_input.completeBaseName() + QLatin1Char('.') + preset.extension_;
fileinfo_output.setFile(temp_dir + QLatin1Char('/') + filename);
@@ -553,7 +554,7 @@ QMap<QString, float> Transcoder::GetProgress() const {
void Transcoder::SetElementProperties(const QString &name, GObject *object) {
Settings s;
s.beginGroup(QLatin1String("Transcoder/") + name + settings_postfix_);
s.beginGroup("Transcoder/"_L1 + name + settings_postfix_);
guint properties_count = 0;
GParamSpec **properties = g_object_class_list_properties(G_OBJECT_GET_CLASS(object), &properties_count);

4
src/transcoder/transcoder.h
View File

@@ -39,6 +39,8 @@
#include "core/shared_ptr.h"
#include "core/song.h"
using namespace Qt::Literals::StringLiterals;
struct TranscoderPreset {
explicit TranscoderPreset() : filetype_(Song::FileType::Unknown) {}
TranscoderPreset(const Song::FileType filetype, const QString &name, const QString &extension, const QString &codec_mimetype, const QString &muxer_mimetype_ = QString());
@@ -55,7 +57,7 @@ class Transcoder : public QObject {
Q_OBJECT
public:
explicit Transcoder(QObject *parent = nullptr, const QString &settings_postfix = QLatin1String(""));
explicit Transcoder(QObject *parent = nullptr, const QString &settings_postfix = ""_L1);
static TranscoderPreset PresetForFileType(const Song::FileType filetype);
static QList<TranscoderPreset> GetAllPresets();