diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-06-16 05:41:24 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-06-16 05:41:24 +0000 |
| commit | e574a099bf9a716a3f2f5373ffb3a11e90377cbe (patch) | |
| tree | 88860dddc1c16766dd8d37aa572eda1218518589 /src/plugins/General/rgscan | |
| parent | 4163cabef5b80851dd68cc196c2d34f48539693b (diff) | |
| download | qmmp-e574a099bf9a716a3f2f5373ffb3a11e90377cbe.tar.gz qmmp-e574a099bf9a716a3f2f5373ffb3a11e90377cbe.tar.bz2 qmmp-e574a099bf9a716a3f2f5373ffb3a11e90377cbe.zip | |
rgscan: fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5158 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/rgscan')
| -rw-r--r-- | src/plugins/General/rgscan/rgscandialog.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index bb4c7693a..03be8abae 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -40,6 +40,7 @@ #include "rgscandialog.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#define FILE_SKIPPED (Qt::UserRole + 1) struct ReplayGainInfoItem { @@ -109,6 +110,7 @@ void RGScanDialog::on_calculateButton_clicked() { QString url = m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString(); RGScanner *scanner = new RGScanner(); + m_ui.tableWidget->item(i, 0)->setData(FILE_SKIPPED, false); if(!scanner->prepare(url)) { @@ -120,6 +122,7 @@ void RGScanDialog::on_calculateButton_clicked() if(m_ui.skipScannedCheckBox->isChecked() && !scanner->oldReplayGainInfo().isEmpty()) { qDebug("RGScanDialog: skipping scanned file.."); + m_ui.tableWidget->item(i, 0)->setData(FILE_SKIPPED, true); QMap<Qmmp::ReplayGainKey, double> rg = scanner->oldReplayGainInfo(); m_ui.tableWidget->setItem(i, 2, new QTableWidgetItem(tr("%1 dB").arg(rg.value(Qmmp::REPLAYGAIN_TRACK_GAIN)))); m_ui.tableWidget->setItem(i, 3, new QTableWidgetItem(tr("%1 dB").arg(rg.value(Qmmp::REPLAYGAIN_ALBUM_GAIN)))); @@ -221,8 +224,8 @@ void RGScanDialog::onScanFinished(QString url) m_ui.tableWidget->setItem(i, 5, new QTableWidgetItem(QString::number(album_peak))); } } - //if(!found) - // m_ui.tableWidget->setItem(i, 3, new QTableWidgetItem(tr("Error"))); + if(!found && !m_ui.tableWidget->item(i, 0)->data(FILE_SKIPPED).toBool()) + m_ui.tableWidget->setItem(i, 3, new QTableWidgetItem(tr("Error"))); } //clear items |
