diff options
Diffstat (limited to 'src/plugins/Input')
32 files changed, 125 insertions, 125 deletions
diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index a3117002c..032945d26 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.cpp @@ -65,7 +65,7 @@ AACFile::AACFile(QIODevice *i, bool metaData) qDebug("AACFile: ADTS header found"); if (!i->isSequential()) parseADTS(); - m_isValid = TRUE; + m_isValid = true; } else if (memcmp(buf, "ADIF", 4) == 0) { @@ -81,7 +81,7 @@ AACFile::AACFile(QIODevice *i, bool metaData) else m_length = 0; m_bitrate = (int)((float)m_bitrate/1000.0f + 0.5f); - m_isValid = TRUE; + m_isValid = true; } } @@ -198,7 +198,7 @@ void AACFile::parseID3v2() TagLib::String title = taglib_tag.title(); QTextCodec *codec = QTextCodec::codecForName ("UTF-8"); - bool utf = TRUE; + bool utf = true; m_metaData.insert(Qmmp::ALBUM, codec->toUnicode(album.toCString(utf)).trimmed()); diff --git a/src/plugins/Input/aac/aacfile.h b/src/plugins/Input/aac/aacfile.h index 9a470b01e..17c38e246 100644 --- a/src/plugins/Input/aac/aacfile.h +++ b/src/plugins/Input/aac/aacfile.h @@ -42,7 +42,7 @@ class QBuffer; class AACFile { public: - AACFile(QIODevice *i, bool metaData = TRUE); + AACFile(QIODevice *i, bool metaData = true); ~AACFile(); diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 6b65685f1..1b5fe510a 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -144,7 +144,7 @@ bool DecoderAAC::initialize() m_input_at -= res; configure(freq, chan, Qmmp::PCM_S16LE); qDebug("DecoderAAC: initialize succes"); - return TRUE; + return true; } qint64 DecoderAAC::read(char *audio, qint64 maxSize) diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 21fe4a310..72307450c 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -47,7 +47,7 @@ const DecoderProperties DecoderAACFactory::properties() const properties.description = tr("AAC Files"); //properties.contentType = ; properties.shortName = "aac"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index b77598d2e..80da4b979 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -85,7 +85,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) //read settings QSettings settings(Qmmp::configFile(), QSettings::IniFormat); int cd_speed = settings.value("cdaudio/speed", 0).toInt(); - bool use_cd_text = settings.value("cdaudio/cdtext", TRUE).toBool(); + bool use_cd_text = settings.value("cdaudio/cdtext", true).toBool(); QList <CDATrack> tracks; cdio_log_set_handler(log_handler); //setup cdio log handler CdIo_t *cdio = 0; @@ -94,7 +94,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) device_path = settings.value("device").toString(); if (device_path.isEmpty() || device_path == "/") { - char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, TRUE); //get drive list with CDA disks + char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { @@ -147,7 +147,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) cdio = 0; return tracks; } - bool use_cddb = TRUE; + bool use_cddb = true; //fill track list for (int i = first_track_number; i <= last_track_number; ++i) { @@ -320,7 +320,7 @@ bool DecoderCDAudio::readFromCache(QList <CDATrack> *tracks, uint disc_id) (*tracks)[i].info.setMetaData(Qmmp::GENRE, settings.value(QString("genre%1").arg(i)).toString()); (*tracks)[i].info.setMetaData(Qmmp::ALBUM, settings.value(QString("album%1").arg(i)).toString()); } - return TRUE; + return true; } qint64 DecoderCDAudio::calculateTrackLength(lsn_t startlsn, lsn_t endlsn) @@ -363,7 +363,7 @@ bool DecoderCDAudio::initialize() if (QUrl(m_url).path() == "/") { - char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, TRUE); //get drive list with CDA disks + char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { @@ -402,7 +402,7 @@ bool DecoderCDAudio::initialize() m_last_sector = tracks[track_at].last_sector; StateHandler::instance()->dispatch(tracks[track_at].info.metaData()); //send metadata qDebug("DecoderCDAudio: initialize succes"); - return TRUE; + return true; } diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 4786259c5..546cc7a2d 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -45,9 +45,9 @@ const DecoderProperties DecoderCDAudioFactory::properties() const properties.name = tr("CD Audio Plugin"); properties.shortName = "cdaudio"; properties.protocols = "cdda"; - properties.hasAbout = TRUE; - properties.noInput = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.noInput = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp index 9151d06e9..ee9ce04f0 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.cpp +++ b/src/plugins/Input/cdaudio/settingsdialog.cpp @@ -35,7 +35,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) int speed = settings.value("speed", 0).toInt(); ui.speedCheckBox->setChecked(speed > 0); ui.speedSpinBox->setValue(speed); - ui.cdtextCheckBox->setChecked(settings.value("cdtext", TRUE).toBool()); + ui.cdtextCheckBox->setChecked(settings.value("cdtext", true).toBool()); ui.cddbGroupBox->setChecked(settings.value("use_cddb", FALSE).toBool()); ui.httpCheckBox->setChecked(settings.value("cddb_http", FALSE).toBool()); ui.serverLineEdit->setText(settings.value("cddb_server", "freedb.org").toString()); diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 63c55c83d..313c7f6fe 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -89,7 +89,7 @@ CUEParser::CUEParser(const QString &fileName) m_infoList.last().setLength(0); } file_path = QFileInfo(fileName).dir().filePath(words[1]); - new_file = TRUE; + new_file = true; } else if (words[0] == "PERFORMER") diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 895961121..abaedaf66 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -115,7 +115,7 @@ bool DecoderCUE::initialize() m_sz = audioParameters().sampleSize(); StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); - return TRUE; + return true; } qint64 DecoderCUE::totalTime() diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 0d4109728..fe259c307 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -47,10 +47,10 @@ const DecoderProperties DecoderCUEFactory::properties() const properties.description = tr("CUE Files"); //properties.contentType = "application/ogg;audio/x-vorbis+ogg"; properties.protocols = "cue"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; - properties.noInput = TRUE; - properties.noOutput = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; + properties.noInput = true; + properties.noOutput = true; return properties; } diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index bda8ff7e7..97dffb244 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -175,7 +175,7 @@ bool DecoderFFmpeg::initialize() configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE); m_bitrate = c->bit_rate; qDebug("DecoderFFmpeg: initialize succes"); - return TRUE; + return true; } @@ -241,7 +241,7 @@ void DecoderFFmpeg::seek(qint64 pos) av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); avcodec_flush_buffers(c); if(m_pkt.size) - m_skip = TRUE; + m_skip = true; } void DecoderFFmpeg::fillBuffer() diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 95f3244fa..89fb95c88 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -59,7 +59,7 @@ bool DecoderFFmpegFactory::supports(const QString &source) const { QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); if (regexp.exactMatch(source)) - return TRUE; + return true; } return FALSE; } @@ -90,9 +90,9 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const return FALSE; } if(filters.contains("*.mp3") && !memcmp(fmt->name, "mp3", 3)) - return TRUE; + return true; if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) - return TRUE; + return true; return FALSE; } @@ -120,8 +120,8 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.contentType += " audio/3gpp audio/3gpp2 audio/mp4 audio/MP4A-LATM audio/mpeg4-generic"; properties.contentType = properties.contentType.trimmed(); properties.shortName = "ffmpeg"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.noInput = FALSE; return properties; } 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); } } diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index b6d7c3edb..d36239911 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -97,8 +97,8 @@ bool DecoderMAD::initialize() stream.next_frame = 0; stream.sync = 0; configure(m_freq, m_channels, Qmmp::PCM_S16LE); - m_inited = TRUE; - return TRUE; + m_inited = true; + return true; } @@ -232,7 +232,7 @@ bool DecoderMAD::findHeader() break; } } - result = TRUE; + result = true; if (input()->isSequential()) break; @@ -245,13 +245,13 @@ bool DecoderMAD::findHeader() if (mad_frame_decode(&frame, &stream) != -1 && findXingHeader(stream.anc_ptr, stream.anc_bitlen)) { - is_vbr = TRUE; + is_vbr = true; qDebug ("DecoderMAD: Xing header detected"); if (xing.flags & XING_FRAMES) { - has_xing = TRUE; + has_xing = true; count = xing.frames; break; } @@ -263,7 +263,7 @@ bool DecoderMAD::findHeader() if (m_bitrate && header.bitrate != m_bitrate) { qDebug ("DecoderMAD: VBR detected"); - is_vbr = TRUE; + is_vbr = true; } else m_bitrate = header.bitrate; @@ -299,7 +299,7 @@ bool DecoderMAD::findHeader() mad_header_finish(&header); input()->seek(0); m_input_bytes = 0; - return TRUE; + return true; } qint64 DecoderMAD::totalTime() @@ -394,7 +394,7 @@ bool DecoderMAD::fillBuffer() } m_input_bytes += len; mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes); - return TRUE; + return true; } uint DecoderMAD::findID3v2(uchar *data, ulong size) //retuns ID3v2 tag size diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 2a7df8189..e58a80ff5 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -42,7 +42,7 @@ bool DecoderMADFactory::supports(const QString &source) const { QString ext = source.right(4).toLower(); if (ext == ".mp1" || ext == ".mp2" || ext == ".mp3") - return TRUE; + return true; else if (ext == ".wav") //check for mp3 wav files { QFile file(source); @@ -52,7 +52,7 @@ bool DecoderMADFactory::supports(const QString &source) const file.close(); if (!memcmp(buf + 8, "WAVE", 4) && !memcmp(buf + 20, "U" ,1)) { - return TRUE; + return true; } } return FALSE; @@ -76,7 +76,7 @@ bool DecoderMADFactory::canDecode(QIODevice *input) const while ((dec_res = mad_header_decode(&header, &stream)) == -1 && MAD_RECOVERABLE(stream.error)) ; - return dec_res != -1 ? TRUE: FALSE; + return dec_res != -1 ? true: FALSE; } return FALSE; } @@ -89,8 +89,8 @@ const DecoderProperties DecoderMADFactory::properties() const properties.filter = "*.mp1 *.mp2 *.mp3 *.wav"; properties.description = tr("MPEG Files"); properties.contentType = "audio/mp3;audio/mpeg"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp index b1ae5a130..b8dc260ee 100644 --- a/src/plugins/Input/mad/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp @@ -323,11 +323,11 @@ void MpegFileTagModel::create() if (m_tag) return; if (m_tagType == TagLib::MPEG::File::ID3v1) - m_tag = m_file->ID3v1Tag(TRUE); + m_tag = m_file->ID3v1Tag(true); else if (m_tagType == TagLib::MPEG::File::ID3v2) - m_tag = m_file->ID3v2Tag(TRUE); + m_tag = m_file->ID3v2Tag(true); else if (m_tagType == TagLib::MPEG::File::APE) - m_tag = m_file->APETag(TRUE); + m_tag = m_file->APETag(true); } void MpegFileTagModel::remove() diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp index dd23582ea..b771560b3 100644 --- a/src/plugins/Input/mad/tagextractor.cpp +++ b/src/plugins/Input/mad/tagextractor.cpp @@ -63,7 +63,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag() if (name.contains("UTF")) { codec = QTextCodec::codecForName ("UTF-8"); - utf = TRUE; + utf = true; } else codec = QTextCodec::codecForName(name); diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 6a9acb581..99e9ba127 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -96,7 +96,7 @@ bool DecoderModPlug::initialize() m_bitrate = m_soundFile->GetNumChannels(); m_totalTime = (qint64) m_soundFile->GetSongTime() * 1000; configure(m_freq, m_chan, (m_bps == 8 ? Qmmp::PCM_S8 : Qmmp::PCM_S16LE)); - return TRUE; + return true; } qint64 DecoderModPlug::totalTime() @@ -187,10 +187,10 @@ void DecoderModPlug::readSettings() CSoundFile::SetWaveConfigEx ( - settings.value("Surround", TRUE).toBool(), - TRUE, + settings.value("Surround", true).toBool(), + true, settings.value("Reverb", FALSE).toBool(), - TRUE, + true, settings.value("Megabass", FALSE).toBool(), settings.value("NoiseReduction", FALSE).toBool(), FALSE @@ -211,7 +211,7 @@ void DecoderModPlug::readSettings() settings.value("BassRange", 30).toInt() ); } - if (settings.value("Surround", TRUE).toBool()) + if (settings.value("Surround", true).toBool()) { CSoundFile::SetSurroundParameters ( @@ -225,7 +225,7 @@ void DecoderModPlug::readSettings() //general /* - settings.value("GrabAmigaMOD", TRUE).toBool());*/ + settings.value("GrabAmigaMOD", true).toBool());*/ //preamp m_usePreamp = settings.value("PreAmp", FALSE).toBool(); m_preampFactor = exp(settings.value("PreAmpLevel", 0.0f).toDouble()); diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 9d9d9e683..1343898ff 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -45,7 +45,7 @@ bool DecoderModPlugFactory::supports(const QString &source) const << ".xmgz" << ".itz" << /*".itr" <<*/ ".itgz" << ".dmf" << ".umx" << ".it" << ".669" << ".xm" << ".mtm" << ".psm" << ".ft2"; if (lExtList.contains(lExt)) - return TRUE; + return true; return FALSE; } @@ -64,9 +64,9 @@ const DecoderProperties DecoderModPlugFactory::properties() const properties.description = tr("ModPlug Files"); //properties.contentType = ; properties.shortName = "modplug"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; - properties.noInput = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; + properties.noInput = true; properties.protocols = "file"; return properties; } diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp index 7fbdeb5b9..6d33f5d7b 100644 --- a/src/plugins/Input/modplug/settingsdialog.cpp +++ b/src/plugins/Input/modplug/settingsdialog.cpp @@ -39,46 +39,46 @@ SettingsDialog::SettingsDialog(QWidget *parent) //general ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", FALSE).toBool()); ui.fileNameCheckBox->setChecked(settings.value("UseFileName", FALSE).toBool()); - ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", TRUE).toBool()); - //settings.value("Oversampling", TRUE).toBool(); - //settings.value("VolumeRamp", TRUE).toBool(); - //settings.value("FastInfo", TRUE).toBool(); + ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", true).toBool()); + //settings.value("Oversampling", true).toBool(); + //settings.value("VolumeRamp", true).toBool(); + //settings.value("FastInfo", true).toBool(); //channels number if (settings.value("Channels", 2).toInt() == 2) - ui.stereoRadioButton->setChecked(TRUE); + ui.stereoRadioButton->setChecked(true); else - ui.monoRadioButton->setChecked(TRUE); + ui.monoRadioButton->setChecked(true); //bits number if (settings.value("Bits", 16).toInt() == 8) - ui.bit8RadioButton->setChecked(TRUE); + ui.bit8RadioButton->setChecked(true); else - ui.bit16RadioButton->setChecked(TRUE); + ui.bit16RadioButton->setChecked(true); //resampling frequency int freq = settings.value("Frequency", 44100).toInt(); if (freq == 48000) - ui.khz48RadioButton->setChecked(TRUE); + ui.khz48RadioButton->setChecked(true); else if (freq == 44100) - ui.khz44RadioButton->setChecked(TRUE); + ui.khz44RadioButton->setChecked(true); else if (freq == 22050) - ui.khz22RadioButton->setChecked(TRUE); + ui.khz22RadioButton->setChecked(true); else - ui.khz11RadioButton->setChecked(TRUE); + ui.khz11RadioButton->setChecked(true); //resampling mode int res = settings.value("ResamplineMode", SRCMODE_POLYPHASE).toInt(); if (res == SRCMODE_NEAREST) - ui.resampNearestRadioButton->setChecked(TRUE); + ui.resampNearestRadioButton->setChecked(true); else if (res == SRCMODE_LINEAR) - ui.resampLinearRadioButton->setChecked(TRUE); + ui.resampLinearRadioButton->setChecked(true); else if (res == SRCMODE_SPLINE) - ui.resampSplineRadioButton->setChecked(TRUE); + ui.resampSplineRadioButton->setChecked(true); else - ui.resampPolyphaseRadioButton->setChecked(TRUE); + ui.resampPolyphaseRadioButton->setChecked(true); //reverberation ui.reverbGroupBox->setChecked(settings.value("Reverb", FALSE).toBool()); ui.reverbDepthSlider->setValue(settings.value("ReverbDepth", 30).toInt()); ui.reverbDelaySlider->setValue(settings.value("ReverbDelay", 100).toInt()); //surround - ui.surGroupBox->setChecked(settings.value("Surround", TRUE).toBool()); + ui.surGroupBox->setChecked(settings.value("Surround", true).toBool()); ui.surDepthSlider->setValue(settings.value("SurroundDepth", 20).toInt()); ui.surDelaySlider->setValue(settings.value("SurroundDelay", 20).toInt()); //bass @@ -92,12 +92,12 @@ SettingsDialog::SettingsDialog(QWidget *parent) //looping int l = settings.value("LoopCount", 0).toInt(); if (l == 0) - ui.dontLoopRadioButton->setChecked(TRUE); + ui.dontLoopRadioButton->setChecked(true); else if (l < 0) - ui.loopForeverRadioButton->setChecked(TRUE); + ui.loopForeverRadioButton->setChecked(true); else { - ui.loopRadioButton->setChecked(TRUE); + ui.loopRadioButton->setChecked(true); ui.loopSpinBox->setValue(l); } settings.endGroup(); @@ -116,9 +116,9 @@ void SettingsDialog::writeSettings() settings.setValue("NoiseReduction", ui.noiseCheckBox->isChecked()); settings.setValue("UseFileName", ui.fileNameCheckBox->isChecked()); settings.setValue("GrabAmigaMOD", ui.amigaCheckBox->isChecked()); - //settings.value("Oversampling", TRUE).toBool(); - //settings.value("VolumeRamp", TRUE).toBool(); - //settings.value("FastInfo", TRUE).toBool(); + //settings.value("Oversampling", true).toBool(); + //settings.value("VolumeRamp", true).toBool(); + //settings.value("FastInfo", true).toBool(); //channels number settings.setValue("Channels", ui.stereoRadioButton->isChecked() ? 2 : 1 ); //bits number diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 82ba36694..763a5b477 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -215,7 +215,7 @@ bool DecoderMPC::initialize() m_totalTime = mpc_streaminfo_get_length(&data()->info) * 1000; qDebug("DecoderMPC: initialize succes"); - return TRUE; + return true; } qint64 DecoderMPC::totalTime() diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index 000015b6f..d862b2de6 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -49,7 +49,7 @@ const DecoderProperties DecoderMPCFactory::properties() const properties.description = tr("Musepack Files"); //properties.contentType = ; properties.shortName = "mpc"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } @@ -68,15 +68,15 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo 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()); } @@ -88,7 +88,7 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo TagLib::APE::Item fld; if(!(fld = tag->itemListMap()["COMPOSER"]).isEmpty()) info->setMetaData(Qmmp::COMPOSER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); } QList <FileInfo*> list; diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index 5ae31eeac..de3b4c893 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp @@ -175,9 +175,9 @@ void MPCFileTagModel::create() if (m_tag) return; if (m_tagType == TagLib::MPC::File::ID3v1) - m_tag = m_file->ID3v1Tag(TRUE); + m_tag = m_file->ID3v1Tag(true); else - m_tag = m_file->APETag(TRUE); + m_tag = m_file->APETag(true); } void MPCFileTagModel::remove() diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 73a54ef0b..abcc65d78 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -68,7 +68,7 @@ bool DecoderSndFile::initialize() configure(m_freq, chan, Qmmp::PCM_S16LE); qDebug("DecoderSndFile: detected format: %08X", snd_info.format); qDebug("DecoderSndFile: initialize succes"); - return TRUE; + return true; } void DecoderSndFile::deinit() diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index be9e98feb..82075e124 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -40,7 +40,7 @@ bool DecoderSndFileFactory::supports(const QString &source) const (source.right(4).toLower() == ".sph") || (source.right(3).toLower() == ".sf") || (source.right(4).toLower() == ".voc")) - return TRUE; + return true; else if (source.right(4).toLower() == ".wav") { //try top open the file @@ -50,7 +50,7 @@ bool DecoderSndFileFactory::supports(const QString &source) const return FALSE; sf_close (sndfile); sndfile = 0; - return TRUE; + return true; } return FALSE; } @@ -68,9 +68,9 @@ const DecoderProperties DecoderSndFileFactory::properties() const properties.description = tr("PCM Files"); //properties.contentType = ""; properties.shortName = "sndfile"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; - properties.noInput = TRUE; + properties.noInput = true; properties.protocols = "file"; return properties; } diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index c1d563963..59fefb79f 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -135,8 +135,8 @@ bool DecoderVorbis::initialize() chan = ogginfo->channels; } configure(freq, chan, Qmmp::PCM_S16LE); - inited = TRUE; - return TRUE; + inited = true; + return true; } diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 6326a92f7..a2b8d3474 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -39,7 +39,7 @@ bool DecoderVorbisFactory::canDecode(QIODevice *input) const char buf[36]; if (input->peek(buf, 36) == 36 && !memcmp(buf, "OggS", 4) && !memcmp(buf + 29, "vorbis", 6)) - return TRUE; + return true; return FALSE; } @@ -52,7 +52,7 @@ const DecoderProperties DecoderVorbisFactory::properties() const properties.filter = "*.ogg"; properties.description = tr("Ogg Vorbis Files"); properties.contentType = "application/ogg;audio/x-vorbis+ogg"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; properties.noInput = FALSE; return properties; @@ -84,15 +84,15 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName, 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()); } @@ -105,10 +105,10 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName, 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()); } QList <FileInfo*> list; diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 0ef036402..a7751b30d 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -26,7 +26,7 @@ #include "vorbismetadatamodel.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() VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { @@ -183,7 +183,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()); @@ -194,7 +194,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); } } diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 3541559b7..df17c8b76 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -134,7 +134,7 @@ bool DecoderWavPack::initialize() m_totalBytes = 0; m_sz = audioParameters().sampleSize() * audioParameters().channels(); qDebug("DecoderWavPack: initialize succes"); - return TRUE; + return true; } int DecoderWavPack::bitrate() diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 34d88eaed..c1b0e8a41 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -46,9 +46,9 @@ const DecoderProperties DecoderWavPackFactory::properties() const properties.description = tr("WavPack Files"); //properties.contentType = ; properties.shortName = "wavpack"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; - properties.noInput = TRUE; + properties.noInput = true; properties.protocols = "file wvpack"; return properties; } |