diff options
Diffstat (limited to 'src/plugins/Input/flac')
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoderflacfactory.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/Input/flac/flacmetadatamodel.cpp | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 4c6c4d951..b4212b19c 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -290,7 +290,7 @@ bool DecoderFLAC::initialize() { qDebug("DecoderFLAC: using cuesheet xiph comment."); m_parser = new CUEParser(xiph_comment->fieldListMap()["CUESHEET"].toString() - .toCString(TRUE), p); + .toCString(true), p); m_track = m_path.section("#", -1).toInt(); if(m_track > m_parser->count()) { @@ -431,7 +431,7 @@ bool DecoderFLAC::initialize() m_sz = audioParameters().sampleSize() * audioParameters().channels(); qDebug("DecoderFLAC: initialize succes"); - return TRUE; + return true; } qint64 DecoderFLAC::totalTime() diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 0315ef125..f60445219 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -54,7 +54,7 @@ const DecoderProperties DecoderFLACFactory::properties() const //properties.contentType = ; properties.shortName = "flac"; properties.protocols = "flac"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } @@ -92,21 +92,21 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo if (tag && !tag->isEmpty()) { info->setMetaData(Qmmp::ALBUM, - QString::fromUtf8(tag->album().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->album().toCString(true)).trimmed()); info->setMetaData(Qmmp::ARTIST, - QString::fromUtf8(tag->artist().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->artist().toCString(true)).trimmed()); info->setMetaData(Qmmp::COMMENT, - QString::fromUtf8(tag->comment().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->comment().toCString(true)).trimmed()); info->setMetaData(Qmmp::GENRE, - QString::fromUtf8(tag->genre().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->genre().toCString(true)).trimmed()); info->setMetaData(Qmmp::TITLE, - QString::fromUtf8(tag->title().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->title().toCString(true)).trimmed()); info->setMetaData(Qmmp::YEAR, tag->year()); info->setMetaData(Qmmp::TRACK, tag->track()); if (tag->fieldListMap().contains("CUESHEET")) { - CUEParser parser(tag->fieldListMap()["CUESHEET"].toString().toCString(TRUE), fileName); + CUEParser parser(tag->fieldListMap()["CUESHEET"].toString().toCString(true), fileName); list = parser.createPlayList(); delete info; if(flacFile) @@ -120,10 +120,10 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo TagLib::StringList fld; if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty()) info->setMetaData(Qmmp::COMPOSER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty()) info->setMetaData(Qmmp::DISCNUMBER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); } if(ap) info->setLength(ap->length()); diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 39633b2aa..d6617357c 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -27,7 +27,7 @@ #include "flacmetadatamodel.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(TRUE)).trimmed() +#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { @@ -212,7 +212,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::COMPOSER: value.isEmpty() ? m_tag->removeField("COMPOSER"): - m_tag->addField("COMPOSER", str, TRUE); + m_tag->addField("COMPOSER", str, true); return; case Qmmp::TRACK: m_tag->setTrack(value.toInt()); @@ -223,7 +223,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::DISCNUMBER: value == "0" ? m_tag->removeField("DISCNUMBER"): - m_tag->addField("DISCNUMBER", str, TRUE); + m_tag->addField("DISCNUMBER", str, true); } } |