// Special case: playlist clips (.mlt or .kdenlive project files)
if (clipType == AV || clipType == Audio || clipType == Video) {
QStringList parameters;
- parameters << "-i" << m_src;
+ parameters << QLatin1String("-i") << m_src;
if (!m_start.isEmpty())
- parameters << "-ss" << m_start <<"-t" << m_end;
+ parameters << QLatin1String("-ss") << m_start <<QLatin1String("-t") << m_end;
if (!m_cutExtraParams.isEmpty()) {
- foreach(const QString &s, m_cutExtraParams.split(' '))
+ foreach(const QString &s, m_cutExtraParams.split(QLatin1Char(' ')))
parameters << s;
}
// Make sure we don't block when proxy file already exists
- parameters << "-y";
+ parameters << QLatin1String("-y");
parameters << m_dest;
m_jobProcess = new QProcess;
m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
void CutClipJob::processLogInfo()
{
if (!m_jobProcess || m_jobDuration == 0 || m_jobStatus == JobAborted) return;
- QString log = m_jobProcess->readAll();
- if (!log.isEmpty()) m_logDetails.append(log + '\n');
+ QString log = QString::fromUtf8(m_jobProcess->readAll());
+ if (!log.isEmpty()) m_logDetails.append(log + QLatin1Char('\n'));
int progress;
// Parse FFmpeg output
- if (log.contains("frame=")) {
- progress = log.section("frame=", 1, 1).simplified().section(' ', 0, 0).toInt();
+ if (log.contains(QLatin1String("frame="))) {
+ progress = log.section(QLatin1String("frame="), 1, 1).simplified().section(QLatin1Char(' '), 0, 0).toInt();
emit jobProgress(m_clipId, (int) (100.0 * progress / m_jobDuration), jobType);
}
- else if (log.contains("time=")) {
- QString time = log.section("time=", 1, 1).simplified().section(' ', 0, 0);
- if (time.contains(':')) {
- QStringList numbers = time.split(':');
+ else if (log.contains(QLatin1String("time="))) {
+ QString time = log.section(QLatin1String("time="), 1, 1).simplified().section(QLatin1Char(' '), 0, 0);
+ if (time.contains(QLatin1Char(':'))) {
+ QStringList numbers = time.split(QLatin1Char(':'));
progress = numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble();
}
else progress = (int) time.toDouble();
m_params = parameters;
description = i18n("Process clip");
QString consum = m_params.at(5);
- if (consum.contains(':')) m_dest = consum.section(':', 1);
+ if (consum.contains(QLatin1Char(':')))
+ m_dest = consum.section(QLatin1Char(':'), 1);
}
void MeltJob::setProducer(Mlt::Producer *producer, const KUrl &url)
{
m_url = QString::fromUtf8(producer->get("resource"));
- if (m_url == "<playlist>" || m_url == "<tractor>" || m_url == "<producer>")
+ if (m_url == QLatin1String("<playlist>") || m_url == QLatin1String("<tractor>") || m_url == QLatin1String("<producer>"))
m_url == url.path();
}
return;
}
int in = m_params.takeFirst().toInt();
- if (in > 0 && !m_extra.contains("offset")) m_extra.insert("offset", QString::number(in));
+ if (in > 0 && !m_extra.contains(QLatin1String("offset"))) m_extra.insert(QLatin1String("offset"), QString::number(in));
int out = m_params.takeFirst().toInt();
QString producerParams =m_params.takeFirst();
QString filter = m_params.takeFirst();
QString filterParams = m_params.takeFirst();
QString consumer = m_params.takeFirst();
- if (consumer.contains(':')) m_dest = consumer.section(':', 1);
+ if (consumer.contains(QLatin1Char(':'))) m_dest = consumer.section(QLatin1Char(':'), 1);
QString consumerParams = m_params.takeFirst();
// optional params
if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
int track = -1;
if (!m_params.isEmpty()) track = m_params.takeFirst().toInt();
- if (!m_extra.contains("finalfilter")) m_extra.insert("finalfilter", filter);
+ if (!m_extra.contains(QLatin1String("finalfilter")))
+ m_extra.insert(QLatin1String("finalfilter"), filter);
if (out != -1 && out <= in) {
m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
setStatus(JobCrashed);
return;
}
- if (m_extra.contains("producer_profile")) {
+ if (m_extra.contains(QLatin1String("producer_profile"))) {
m_profile = new Mlt::Profile;
m_profile->set_explicit(false);
}
else {
m_profile = new Mlt::Profile(KdenliveSettings::current_profile().toUtf8().constData());
}
- if (m_extra.contains("resize_profile")) {
- m_profile->set_height(m_extra.value("resize_profile").toInt());
+ if (m_extra.contains(QLatin1String("resize_profile"))) {
+ m_profile->set_height(m_extra.value(QLatin1String("resize_profile")).toInt());
m_profile->set_width(m_profile->height() * m_profile->sar());
}
if (out == -1) {
setStatus(JobCrashed);
return;
}
- if (m_extra.contains("producer_profile")) {
+ if (m_extra.contains(QLatin1String("producer_profile"))) {
m_profile->from_producer(*m_producer);
m_profile->set_explicit(true);
}
- QStringList list = producerParams.split(' ', QString::SkipEmptyParts);
+ QStringList list = producerParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
foreach(const QString &data, list) {
- if (data.contains('=')) {
- m_producer->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+ if (data.contains(QLatin1Char('='))) {
+ m_producer->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
}
}
- if (consumer.contains(":")) {
- m_consumer = new Mlt::Consumer(*m_profile, consumer.section(':', 0, 0).toUtf8().constData(), consumer.section(':', 1).toUtf8().constData());
+ if (consumer.contains(QLatin1String(":"))) {
+ m_consumer = new Mlt::Consumer(*m_profile, consumer.section(QLatin1Char(':'), 0, 0).toUtf8().constData(), consumer.section(QLatin1Char(':'), 1).toUtf8().constData());
}
else {
m_consumer = new Mlt::Consumer(*m_profile, consumer.toUtf8().constData());
m_consumer->set("real_time", -KdenliveSettings::mltthreads() );
- list = consumerParams.split(' ', QString::SkipEmptyParts);
+ list = consumerParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
foreach(const QString &data, list) {
- if (data.contains('=')) {
+ if (data.contains(QLatin1Char('='))) {
kDebug()<<"// filter con: "<<data;
- m_consumer->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+ m_consumer->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
}
}
setStatus(JobCrashed);
return;
}
- list = filterParams.split(' ', QString::SkipEmptyParts);
+ list = filterParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
foreach(const QString &data, list) {
- if (data.contains('=')) {
+ if (data.contains(QLatin1Char('='))) {
kDebug()<<"// filter p: "<<data;
- m_filter->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+ m_filter->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
}
}
Mlt::Tractor tractor;
m_consumer->run();
QMap <QString, QString> jobResults;
- if (m_jobStatus != JobAborted && m_extra.contains("key")) {
- QString result = m_filter->get(m_extra.value("key").toUtf8().constData());
- jobResults.insert(m_extra.value("key"), result);
+ if (m_jobStatus != JobAborted && m_extra.contains(QLatin1String("key"))) {
+ QString result = QString::fromLatin1(m_filter->get(m_extra.value(QLatin1String("key")).toUtf8().constData()));
+ jobResults.insert(m_extra.value(QLatin1String("key")), result);
}
if (!jobResults.isEmpty() && m_jobStatus != JobAborted) {
emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
bool MeltJob::isProjectFilter() const
{
- return m_extra.contains("projecttreefilter");
+ return m_extra.contains(QLatin1String("projecttreefilter"));
}
void MeltJob::setStatus(ClipJobStatus status)
m_isFfmpegJob = false;
QStringList mltParameters;
mltParameters << m_src;
- mltParameters << "-consumer" << "avformat:" + m_dest;
- QStringList params = m_proxyParams.split('-', QString::SkipEmptyParts);
+ mltParameters << QLatin1String("-consumer") << QLatin1String("avformat:") + m_dest;
+ QStringList params = m_proxyParams.split(QLatin1Char('-'), QString::SkipEmptyParts);
foreach(const QString &s, params) {
QString t = s.simplified();
- if (t.count(' ') == 0) {
- t.append("=1");
+ if (t.count(QLatin1Char(' ')) == 0) {
+ t.append(QLatin1String("=1"));
}
- else t.replace(' ', '=');
+ else t.replace(QLatin1Char(' '), QLatin1String("="));
mltParameters << t;
}
- mltParameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads()));
+ mltParameters.append(QString::fromLatin1("real_time=-%1").arg(KdenliveSettings::mltthreads()));
//TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
double display_ratio;
- if (m_src.startsWith("consumer:")) display_ratio = KdenliveDoc::getDisplayRatio(m_src.section(":", 1));
+ if (m_src.startsWith(QLatin1String("consumer:"))) display_ratio = KdenliveDoc::getDisplayRatio(m_src.section(QLatin1String(":"), 1));
else display_ratio = KdenliveDoc::getDisplayRatio(m_src);
- mltParameters << "aspect=" + QLocale().toString(display_ratio);
+ mltParameters << QLatin1String("aspect=") + QLocale().toString(display_ratio);
// Ask for progress reporting
- mltParameters << "progress=1";
+ mltParameters << QLatin1String("progress=1");
m_jobProcess = new QProcess;
m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
} else {
m_isFfmpegJob = true;
QStringList parameters;
- parameters << "-i" << m_src;
+ parameters << QLatin1String("-i") << m_src;
QString params = m_proxyParams;
- foreach(const QString &s, params.split(' '))
+ foreach(const QString &s, params.split(QLatin1Char(' ')))
parameters << s;
// Make sure we don't block when proxy file already exists
- parameters << "-y";
+ parameters << QLatin1String("-y");
parameters << m_dest;
m_jobProcess = new QProcess;
m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
void ProxyJob::processLogInfo()
{
if (!m_jobProcess || m_jobStatus == JobAborted) return;
- QString log = m_jobProcess->readAll();
+ QString log = QString::fromUtf8(m_jobProcess->readAll());
if (!log.isEmpty())
- m_logDetails.append(log + '\n');
+ m_logDetails.append(log + QLatin1Char('\n'));
else
return;
if (m_isFfmpegJob) {
// Parse FFmpeg output
if (m_jobDuration == 0) {
- if (log.contains("Duration:")) {
- QString data = log.section("Duration:", 1, 1).section(',', 0, 0).simplified();
- QStringList numbers = data.split(':');
+ if (log.contains(QLatin1String("Duration:"))) {
+ QString data = log.section(QLatin1String("Duration:"), 1, 1).section(QLatin1Char(','), 0, 0).simplified();
+ QStringList numbers = data.split(QLatin1Char(':'));
m_jobDuration = (int) (numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble());
}
}
- else if (log.contains("time=")) {
- QString time = log.section("time=", 1, 1).simplified().section(' ', 0, 0);
- if (time.contains(':')) {
- QStringList numbers = time.split(':');
+ else if (log.contains(QLatin1String("time="))) {
+ QString time = log.section(QLatin1String("time="), 1, 1).simplified().section(QLatin1Char(' '), 0, 0);
+ if (time.contains(QLatin1Char(':'))) {
+ QStringList numbers = time.split(QLatin1Char(':'));
progress = numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble();
}
else progress = (int) time.toDouble();
}
else {
// Parse MLT output
- if (log.contains("percentage:")) {
- progress = log.section("percentage:", 1).simplified().section(' ', 0, 0).toInt();
+ if (log.contains(QLatin1String("percentage:"))) {
+ progress = log.section(QLatin1String("percentage:"), 1).simplified().section(QLatin1Char(' '), 0, 0).toInt();
emit jobProgress(m_clipId, progress, jobType);
}
}
stringMap ProxyJob::cancelProperties()
{
QMap <QString, QString> props;
- props.insert("proxy", "-");
+ props.insert(QLatin1String("proxy"), QLatin1String("-"));
return props;
}