diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp index 5c21fa698..75c8793f3 100644 --- a/companion/src/modeledit/mixes.cpp +++ b/companion/src/modeledit/mixes.cpp @@ -191,9 +191,8 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch) str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString())); } - if (md->carryTrim) { - str += " " + Qt::escape(tr("NoTrim")); - } + if (md->carryTrim>0) str += " " + Qt::escape(tr("NoTrim")); + else if (md->carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString(); if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo")); if (md->sOffset) str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset))); diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp index 94d4ba623..10ac6afc3 100644 --- a/companion/src/printdialog.cpp +++ b/companion/src/printdialog.cpp @@ -347,9 +347,8 @@ void PrintDialog::printMixes() str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString())); } - if (md->carryTrim) { - str += " " + Qt::escape(tr("NoTrim")); - } + if (md->carryTrim>0) str += " " + Qt::escape(tr("NoTrim")); + else if (md->carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString(); if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo")); if (md->sOffset) str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));