proxy: restore pdivider (de)serialization dropped in the commit split
The load/save of the per-footage custom divider attribute was lost when the proxy changes were re-applied during the three-way commit split; ProxyManager.FootagePersistsCustomProxyParams caught it.
This commit is contained in:
@@ -703,6 +703,8 @@ bool Footage::load_custom(QXmlStreamReader *reader, SerializedData *data)
|
|||||||
custom_params.width = attr.value().toInt();
|
custom_params.width = attr.value().toInt();
|
||||||
} else if (attr.name() == QStringLiteral("pheight")) {
|
} else if (attr.name() == QStringLiteral("pheight")) {
|
||||||
custom_params.height = attr.value().toInt();
|
custom_params.height = attr.value().toInt();
|
||||||
|
} else if (attr.name() == QStringLiteral("pdivider")) {
|
||||||
|
custom_params.divider = attr.value().toInt();
|
||||||
} else if (attr.name() == QStringLiteral("pcrf")) {
|
} else if (attr.name() == QStringLiteral("pcrf")) {
|
||||||
custom_params.crf = attr.value().toInt();
|
custom_params.crf = attr.value().toInt();
|
||||||
} else if (attr.name() == QStringLiteral("ppreset")) {
|
} else if (attr.name() == QStringLiteral("ppreset")) {
|
||||||
@@ -791,6 +793,9 @@ void Footage::save_custom(QXmlStreamWriter *writer) const
|
|||||||
writer->writeAttribute(
|
writer->writeAttribute(
|
||||||
QStringLiteral("pheight"),
|
QStringLiteral("pheight"),
|
||||||
QString::number(custom_proxy_params_.height));
|
QString::number(custom_proxy_params_.height));
|
||||||
|
writer->writeAttribute(
|
||||||
|
QStringLiteral("pdivider"),
|
||||||
|
QString::number(custom_proxy_params_.divider));
|
||||||
writer->writeAttribute(
|
writer->writeAttribute(
|
||||||
QStringLiteral("pcrf"),
|
QStringLiteral("pcrf"),
|
||||||
QString::number(custom_proxy_params_.crf));
|
QString::number(custom_proxy_params_.crf));
|
||||||
|
|||||||
Reference in New Issue
Block a user