diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Input | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2 qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip | |
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input')
54 files changed, 204 insertions, 204 deletions
diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index bd6708b6e..6a4c3740c 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -36,10 +36,10 @@ DecoderAAC::DecoderAAC(QIODevice *i) { m_bitrate = 0; m_totalTime = 0; - m_data = 0; - m_input_buf = 0; + m_data = nullptr; + m_input_buf = nullptr; m_input_at = 0; - m_sample_buf = 0; + m_sample_buf = nullptr; m_sample_buf_at = 0; m_sample_buf_size = 0; } @@ -52,11 +52,11 @@ DecoderAAC::~DecoderAAC() if (data()->handle) NeAACDecClose (data()->handle); delete data(); - m_data = 0; + m_data = nullptr; } if (m_input_buf) delete [] m_input_buf; - m_input_buf = 0; + m_input_buf = nullptr; m_bitrate = 0; } diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index eca457612..6ceca28ee 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -92,7 +92,7 @@ MetaDataModel* DecoderAACFactory::createMetaDataModel(const QString &path, bool { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderAACFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp index 6056dca98..8d10647ab 100644 --- a/src/plugins/Input/archive/archiveinputdevice.cpp +++ b/src/plugins/Input/archive/archiveinputdevice.cpp @@ -23,8 +23,8 @@ ArchiveInputDevice::ArchiveInputDevice(const QString &url, QObject *parent) : QIODevice(parent) { - m_archive = 0; - m_entry = 0; + m_archive = nullptr; + m_entry = nullptr; QString filePath = url.section("#", -1); QString archivePath = url; archivePath.remove(QRegExp("^.+://")); @@ -74,7 +74,7 @@ ArchiveInputDevice::~ArchiveInputDevice() { archive_read_close(m_archive); archive_read_free(m_archive); - m_archive = 0; + m_archive = nullptr; } } diff --git a/src/plugins/Input/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h index eab4747eb..e6c31fdda 100644 --- a/src/plugins/Input/archive/archiveinputdevice.h +++ b/src/plugins/Input/archive/archiveinputdevice.h @@ -30,8 +30,8 @@ class ArchiveInputDevice : public QIODevice { Q_OBJECT public: - ArchiveInputDevice(const QString &url, QObject *parent = 0); - ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = 0); + ArchiveInputDevice(const QString &url, QObject *parent = nullptr); + ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr); virtual ~ArchiveInputDevice(); bool seek(qint64 pos); diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp index d4cd7933d..fa5bcf292 100644 --- a/src/plugins/Input/archive/decoder_archive.cpp +++ b/src/plugins/Input/archive/decoder_archive.cpp @@ -27,8 +27,8 @@ DecoderArchive::DecoderArchive(const QString &url) { m_url = url; - m_decoder = 0; - m_input = 0; + m_decoder = nullptr; + m_input = nullptr; } DecoderArchive::~DecoderArchive() @@ -36,12 +36,12 @@ DecoderArchive::~DecoderArchive() if(m_decoder) { delete m_decoder; - m_decoder = 0; + m_decoder = nullptr; } if(m_input) { delete m_input; - m_input = 0; + m_input = nullptr; } } @@ -80,7 +80,7 @@ bool DecoderArchive::initialize() return false; } - DecoderFactory *factory = 0; + DecoderFactory *factory = nullptr; if(filtered.size() == 1) factory = filtered.first(); else diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 50a994229..2b0f6ce25 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -56,7 +56,7 @@ Decoder *DecoderArchiveFactory::create(const QString &url, QIODevice *) QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) { QList<TrackInfo *> list; - struct archive_entry *entry = 0; + struct archive_entry *entry = nullptr; struct archive *a = archive_read_new(); archive_read_support_filter_all(a); @@ -109,7 +109,7 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr .arg(archivePath) .arg(filePath)); - ArchiveInputDevice dev(a, entry, 0); + ArchiveInputDevice dev(a, entry, nullptr); ArchiveTagReader reader(&dev, list.last()->path()); if(parts & TrackInfo::MetaData) @@ -140,7 +140,7 @@ MetaDataModel* DecoderArchiveFactory::createMetaDataModel(const QString &path, b { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderArchiveFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 1eda15805..11e8119ab 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -87,7 +87,7 @@ DecoderCDAudio::DecoderCDAudio(const QString &url) : Decoder() m_last_sector = -1; m_current_sector = -1; m_url = url; - m_cdio = 0; + m_cdio = nullptr; m_buffer_at = 0; m_buffer = new char[CDDA_BUFFER_SIZE]; } @@ -98,7 +98,7 @@ DecoderCDAudio::~DecoderCDAudio() if (m_cdio) { cdio_destroy(m_cdio); - m_cdio = 0; + m_cdio = nullptr; } delete [] m_buffer; } @@ -111,13 +111,13 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn 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; + CdIo_t *cdio = nullptr; QString device_path = device; if (device_path.isEmpty() || device_path == "/") device_path = settings.value("cdaudio/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(nullptr, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { @@ -164,7 +164,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn qWarning("DecoderCDAudio: unable to set drive speed to %dX.", cd_speed); } - cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio(cdio, 1, 0); //create paranoya CD-ROM object + cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio(cdio, 1, nullptr); //create paranoya CD-ROM object //get first and last track numbers int first_track_number = cdio_get_first_track_num(pcdrom_drive->p_cdio); int last_track_number = cdio_get_last_track_num(pcdrom_drive->p_cdio); @@ -173,7 +173,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn { qWarning("DecoderCDAudio: invalid first (last) track number."); cdio_destroy(cdio); - cdio = 0; + cdio = nullptr; return tracks; } bool use_cddb = true; @@ -201,12 +201,12 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn qWarning("DecoderCDAudio: invalid stard(end) lsn for the track %d.", i); tracks.clear(); cdio_destroy(cdio); - cdio = 0; + cdio = nullptr; return tracks; } //cd text #if LIBCDIO_VERSION_NUM <= 83 - cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio, i) : 0; + cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio, i) : nullptr; if (cdtext && cdtext->field[CDTEXT_TITLE]) { t.info.setValue(Qmmp::TITLE, QString::fromLocal8Bit(cdtext->field[CDTEXT_TITLE])); @@ -215,7 +215,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn use_cddb = false; } #else - cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio) : 0; + cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio) : nullptr; if (cdtext) { t.info.setValue(Qmmp::TITLE, QString::fromUtf8(cdtext_get_const(cdtext,CDTEXT_FIELD_TITLE,i))); @@ -329,7 +329,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn } cdio_destroy(cdio); - cdio = 0; + cdio = nullptr; m_track_cache = tracks; return tracks; } @@ -425,7 +425,7 @@ bool DecoderCDAudio::initialize() 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(nullptr, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 9fca3c1fe..f79ba96be 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -72,7 +72,7 @@ MetaDataModel* DecoderCDAudioFactory::createMetaDataModel(const QString &path, b { Q_UNUSED(readOnly); Q_UNUSED(path); - return 0; + return nullptr; } void DecoderCDAudioFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/cdaudio/settingsdialog.h b/src/plugins/Input/cdaudio/settingsdialog.h index 7eb53d5a9..ff784a6db 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.h +++ b/src/plugins/Input/cdaudio/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 350d6f76e..b50eda92d 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -49,9 +49,9 @@ CUEParser::CUEParser(const QString &path) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("CUE"); m_dirty = settings.value("dirty_cue", false).toBool(); - QTextCodec *codec = 0; + QTextCodec *codec = nullptr; #ifdef WITH_ENCA - EncaAnalyser analyser = 0; + EncaAnalyser analyser = nullptr; if(settings.value("use_enca", false).toBool()) { analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData()); diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index e21dfdca5..ae7f06edc 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -33,27 +33,27 @@ DecoderCUE::DecoderCUE(const QString &url) : Decoder() { m_path = url; - m_decoder = 0; - m_parser = 0; + m_decoder = nullptr; + m_parser = nullptr; m_track = 0; - m_buf = 0; - m_input = 0; + m_buf = nullptr; + m_input = nullptr; } DecoderCUE::~DecoderCUE() { if(m_decoder) delete m_decoder; - m_decoder = 0; + m_decoder = nullptr; if(m_parser) delete m_parser; - m_parser = 0; + m_parser = nullptr; if(m_buf) delete [] m_buf; - m_buf = 0; + m_buf = nullptr; if(m_input) m_input->deleteLater(); - m_input = 0; + m_input = nullptr; } bool DecoderCUE::initialize() @@ -134,7 +134,7 @@ qint64 DecoderCUE::read(unsigned char *data, qint64 size) if(size >= m_buf_size) { delete[] m_buf; - m_buf = 0; + m_buf = nullptr; m_buf_size = 0; } else diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 103f4b597..35d66e1dd 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -77,7 +77,7 @@ QList<TrackInfo *> DecoderCUEFactory::createPlayList(const QString &path, TrackI MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return path.startsWith("cue://") ? new CUEMetaDataModel(path) : 0; + return path.startsWith("cue://") ? new CUEMetaDataModel(path) : nullptr; } void DecoderCUEFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h index 60bdc6c07..158be59dd 100644 --- a/src/plugins/Input/cue/settingsdialog.h +++ b/src/plugins/Input/cue/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 99ff7c402..9548970fa 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -71,17 +71,17 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) { m_bitrate = 0; m_totalTime = 0; - ic = 0; + ic = nullptr; m_path = path; m_temp_pkt.size = 0; m_pkt.size = 0; - m_pkt.data = 0; + m_pkt.data = nullptr; m_output_at = 0; m_skipBytes = 0; - m_stream = 0; - m_decoded_frame = 0; + m_stream = nullptr; + m_decoded_frame = nullptr; m_channels = 0; - c = 0; + c = nullptr; audioIndex = 0; m_seekTime = -1; av_init_packet(&m_pkt); @@ -145,7 +145,7 @@ bool DecoderFFmpeg::initialize() qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name); qDebug("=%s=", fmt->name); - m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, NULL, ffmpeg_seek); + m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, nullptr, ffmpeg_seek); if(!m_stream) { qWarning("DecoderFFmpeg: unable to initialize I/O callbacks"); @@ -155,37 +155,37 @@ bool DecoderFFmpeg::initialize() m_stream->max_packet_size = INPUT_BUFFER_SIZE; ic->pb = m_stream; - if(avformat_open_input(&ic, 0, fmt, 0) != 0) + if(avformat_open_input(&ic, nullptr, fmt, nullptr) != 0) { qDebug("DecoderFFmpeg: avformat_open_input() failed"); return false; } - avformat_find_stream_info(ic, 0); + avformat_find_stream_info(ic, nullptr); if(ic->pb) ic->pb->eof_reached = 0; if (input()->isSequential()) { QMap<Qmmp::MetaData, QString> metaData; - AVDictionaryEntry *album = av_dict_get(ic->metadata,"album",0,0); + AVDictionaryEntry *album = av_dict_get(ic->metadata,"album",nullptr,0); if(!album) - album = av_dict_get(ic->metadata,"WM/AlbumTitle",0,0); - AVDictionaryEntry *artist = av_dict_get(ic->metadata,"artist",0,0); + album = av_dict_get(ic->metadata,"WM/AlbumTitle",nullptr,0); + AVDictionaryEntry *artist = av_dict_get(ic->metadata,"artist",nullptr,0); if(!artist) - artist = av_dict_get(ic->metadata,"author",0,0); - AVDictionaryEntry *comment = av_dict_get(ic->metadata,"comment",0,0); - AVDictionaryEntry *genre = av_dict_get(ic->metadata,"genre",0,0); - AVDictionaryEntry *title = av_dict_get(ic->metadata,"title",0,0); - AVDictionaryEntry *year = av_dict_get(ic->metadata,"WM/Year",0,0); + artist = av_dict_get(ic->metadata,"author",nullptr,0); + AVDictionaryEntry *comment = av_dict_get(ic->metadata,"comment",nullptr,0); + AVDictionaryEntry *genre = av_dict_get(ic->metadata,"genre",nullptr,0); + AVDictionaryEntry *title = av_dict_get(ic->metadata,"title",nullptr,0); + AVDictionaryEntry *year = av_dict_get(ic->metadata,"WM/Year",nullptr,0); if(!year) - year = av_dict_get(ic->metadata,"year",0,0); + year = av_dict_get(ic->metadata,"year",nullptr,0); if(!year) - year = av_dict_get(ic->metadata,"date",0,0); - AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",0,0); + year = av_dict_get(ic->metadata,"date",nullptr,0); + AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",nullptr,0); if(!track) - track = av_dict_get(ic->metadata,"WM/Track",0,0); + track = av_dict_get(ic->metadata,"WM/Track",nullptr,0); if(!track) - track = av_dict_get(ic->metadata,"WM/TrackNumber",0,0); + track = av_dict_get(ic->metadata,"WM/TrackNumber",nullptr,0); if(album) metaData.insert(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed()); @@ -209,12 +209,12 @@ bool DecoderFFmpeg::initialize() setReplayGainInfo(rg.replayGainInfo()); #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,4,0)) //ffmpeg-3.1: 57.48.101 - c = avcodec_alloc_context3(NULL); + c = avcodec_alloc_context3(nullptr); #endif ic->flags |= AVFMT_FLAG_GENPTS; av_read_play(ic); - audioIndex = av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0); + audioIndex = av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0); if(audioIndex < 0) { qWarning("DecoderFFmpeg: unable to find audio stream"); @@ -246,7 +246,7 @@ bool DecoderFFmpeg::initialize() m_channels = c->request_channels; #endif - av_dump_format(ic,0,0,0); + av_dump_format(ic,0,nullptr,0); AVCodec *codec = avcodec_find_decoder(c->codec_id); @@ -256,7 +256,7 @@ bool DecoderFFmpeg::initialize() return false; } - if (avcodec_open2(c, codec, 0) < 0) + if (avcodec_open2(c, codec, nullptr) < 0) { qWarning("DecoderFFmpeg: error while opening codec for output stream"); return false; @@ -393,7 +393,7 @@ qint64 DecoderFFmpeg::ffmpeg_decode() #endif if(got_frame) - out_size = av_samples_get_buffer_size(0, c->channels, m_decoded_frame->nb_samples, + out_size = av_samples_get_buffer_size(nullptr, c->channels, m_decoded_frame->nb_samples, c->sample_fmt, 1); else out_size = 0; @@ -517,7 +517,7 @@ void DecoderFFmpeg::fillBuffer() #else av_free_packet(&m_pkt); #endif - m_pkt.data = 0; + m_pkt.data = nullptr; m_temp_pkt.size = 0; break; } @@ -531,7 +531,7 @@ void DecoderFFmpeg::fillBuffer() #else av_free_packet(&m_pkt); #endif - m_pkt.data = 0; + m_pkt.data = nullptr; m_temp_pkt.size = 0; continue; } diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index f10186c69..abca4bfb6 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -165,12 +165,12 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra if(parts == TrackInfo::NoParts) return QList<TrackInfo*>() << info; - AVFormatContext *in = 0; + AVFormatContext *in = nullptr; #ifdef Q_OS_WIN - if(avformat_open_input(&in, path.toUtf8().constData(), 0, 0) < 0) + if(avformat_open_input(&in, path.toUtf8().constData(), nullptr, nullptr) < 0) #else - if(avformat_open_input(&in, path.toLocal8Bit().constData(), 0, 0) < 0) + if(avformat_open_input(&in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0) #endif { qDebug("DecoderFFmpegFactory: unable to open file"); @@ -178,29 +178,29 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra return QList<TrackInfo*>(); } - avformat_find_stream_info(in, 0); + avformat_find_stream_info(in, nullptr); if(parts & TrackInfo::MetaData) { - AVDictionaryEntry *album = av_dict_get(in->metadata,"album",0,0); + AVDictionaryEntry *album = av_dict_get(in->metadata,"album",nullptr,0); if(!album) - album = av_dict_get(in->metadata,"WM/AlbumTitle",0,0); - AVDictionaryEntry *artist = av_dict_get(in->metadata,"artist",0,0); + album = av_dict_get(in->metadata,"WM/AlbumTitle",nullptr,0); + AVDictionaryEntry *artist = av_dict_get(in->metadata,"artist",nullptr,0); if(!artist) - artist = av_dict_get(in->metadata,"author",0,0); - AVDictionaryEntry *comment = av_dict_get(in->metadata,"comment",0,0); - AVDictionaryEntry *genre = av_dict_get(in->metadata,"genre",0,0); - AVDictionaryEntry *title = av_dict_get(in->metadata,"title",0,0); - AVDictionaryEntry *year = av_dict_get(in->metadata,"WM/Year",0,0); + artist = av_dict_get(in->metadata,"author",nullptr,0); + AVDictionaryEntry *comment = av_dict_get(in->metadata,"comment",nullptr,0); + AVDictionaryEntry *genre = av_dict_get(in->metadata,"genre",nullptr,0); + AVDictionaryEntry *title = av_dict_get(in->metadata,"title",nullptr,0); + AVDictionaryEntry *year = av_dict_get(in->metadata,"WM/Year",nullptr,0); if(!year) - year = av_dict_get(in->metadata,"year",0,0); + year = av_dict_get(in->metadata,"year",nullptr,0); if(!year) - year = av_dict_get(in->metadata,"date",0,0); - AVDictionaryEntry *track = av_dict_get(in->metadata,"track",0,0); + year = av_dict_get(in->metadata,"date",nullptr,0); + AVDictionaryEntry *track = av_dict_get(in->metadata,"track",nullptr,0); if(!track) - track = av_dict_get(in->metadata,"WM/Track",0,0); + track = av_dict_get(in->metadata,"WM/Track",nullptr,0); if(!track) - track = av_dict_get(in->metadata,"WM/TrackNumber",0,0); + track = av_dict_get(in->metadata,"WM/TrackNumber",nullptr,0); if(album) info->setValue(Qmmp::ALBUM, QString::fromUtf8(album->value)); @@ -220,7 +220,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra if(parts & TrackInfo::Properties) { - int idx = av_find_best_stream(in, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0); + int idx = av_find_best_stream(in, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0); if(idx >= 0) { #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101 diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index d3b725744..17907d0cd 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -23,14 +23,14 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true) { - m_in = 0; + m_in = nullptr; #ifdef Q_OS_WIN - if (avformat_open_input(&m_in, path.toUtf8().constData(), 0, 0) < 0) + if (avformat_open_input(&m_in, path.toUtf8().constData(), nullptr, nullptr) < 0) #else - if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), 0, 0) < 0) + if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0) #endif return; - avformat_find_stream_info(m_in, 0); + avformat_find_stream_info(m_in, nullptr); av_read_play(m_in); } @@ -45,9 +45,9 @@ QPixmap FFmpegMetaDataModel::cover() const if(!m_in) return QPixmap(); #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101 - AVCodecParameters *c = 0; + AVCodecParameters *c = nullptr; #else - AVCodecContext *c = 0; + AVCodecContext *c = nullptr; #endif for (uint idx = 0; idx < m_in->nb_streams; idx++) diff --git a/src/plugins/Input/ffmpeg/replaygainreader.cpp b/src/plugins/Input/ffmpeg/replaygainreader.cpp index 13c796614..3d4a11d22 100644 --- a/src/plugins/Input/ffmpeg/replaygainreader.cpp +++ b/src/plugins/Input/ffmpeg/replaygainreader.cpp @@ -22,7 +22,7 @@ ReplayGainReader::ReplayGainReader(AVFormatContext *ic) { - AVDictionaryEntry *t = 0; + AVDictionaryEntry *t = nullptr; while((t = av_dict_get(ic->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { if(!strcmp(t->key, "replaygain_album_gain")) diff --git a/src/plugins/Input/ffmpeg/settingsdialog.h b/src/plugins/Input/ffmpeg/settingsdialog.h index be1bbf22b..599c3481e 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.h +++ b/src/plugins/Input/ffmpeg/settingsdialog.h @@ -31,7 +31,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 29bd4b119..0f2c14df2 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -266,13 +266,13 @@ DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i) { m_path = path; m_data = new flac_data; - m_data->decoder = NULL; + m_data->decoder = nullptr; m_data->input = i; - m_parser = 0; + m_parser = nullptr; length_in_bytes = 0; m_totalBytes = 0; m_sz = 0; - m_buf = 0; + m_buf = nullptr; m_offset = 0; m_track = 0; } @@ -286,11 +286,11 @@ DecoderFLAC::~DecoderFLAC() if (m_data->decoder) FLAC__stream_decoder_delete(m_data->decoder); delete m_data; - m_data = 0; + m_data = nullptr; } if(m_buf) delete[] m_buf; - m_buf = 0; + m_buf = nullptr; } bool DecoderFLAC::initialize() @@ -506,7 +506,7 @@ qint64 DecoderFLAC::read(unsigned char *buf, qint64 size) if(size >= m_buf_size) { delete[] m_buf; - m_buf = 0; + m_buf = nullptr; m_buf_size = 0; } else @@ -547,11 +547,11 @@ void DecoderFLAC::deinit() { m_data->input->close(); delete m_data->input; - m_data->input = 0; + m_data->input = nullptr; }; if(m_parser) delete m_parser; - m_parser = 0; + m_parser = nullptr; } const QString DecoderFLAC::nextURL() const diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 02ae1f6bf..28aec227a 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -91,11 +91,11 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI if(parts == TrackInfo::NoParts) return QList<TrackInfo *>() << info; - TagLib::Ogg::XiphComment *tag = 0; - TagLib::FLAC::Properties *ap = 0; + TagLib::Ogg::XiphComment *tag = nullptr; + TagLib::FLAC::Properties *ap = nullptr; - TagLib::FLAC::File *flacFile = 0; - TagLib::Ogg::FLAC::File *oggFlacFile = 0; + TagLib::FLAC::File *flacFile = nullptr; + TagLib::Ogg::FLAC::File *oggFlacFile = nullptr; TagLib::FileStream stream(QStringToFileName(path), true); @@ -200,7 +200,7 @@ MetaDataModel* DecoderFLACFactory::createMetaDataModel(const QString &path, bool if (!path.contains("://") || path.startsWith("flac://")) return new FLACMetaDataModel(path, readOnly); else - return 0; + return nullptr; } void DecoderFLACFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index ca06512b9..0457d22ef 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -38,9 +38,9 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly) : MetaDataModel(true) #endif { - m_file = 0; - m_stream = 0; - m_tag = 0; + m_file = nullptr; + m_stream = nullptr; + m_tag = nullptr; if(path.startsWith("flac://")) { @@ -81,7 +81,7 @@ FLACMetaDataModel::~FLACMetaDataModel() if(m_file) { delete m_file; - m_file = 0; + m_file = nullptr; } if(m_stream) delete m_stream; diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp index 3eca96348..4de43f802 100644 --- a/src/plugins/Input/gme/decoder_gme.cpp +++ b/src/plugins/Input/gme/decoder_gme.cpp @@ -26,7 +26,7 @@ DecoderGme::DecoderGme(const QString &path) : Decoder() { m_path = path; - m_emu = 0; + m_emu = nullptr; } DecoderGme::~DecoderGme() @@ -44,7 +44,7 @@ bool DecoderGme::initialize() { qWarning("DecoderGme: track number is out of range"); gme_delete(m_emu); - m_emu = 0; + m_emu = nullptr; return false; } gme_start_track(m_emu, track - 1); diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index cbd7fed44..50fee26a1 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -89,7 +89,7 @@ MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, bool { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderGmeFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp index 04a335701..fad5274f5 100644 --- a/src/plugins/Input/gme/gmehelper.cpp +++ b/src/plugins/Input/gme/gmehelper.cpp @@ -25,7 +25,7 @@ GmeHelper::GmeHelper() { - m_emu = 0; + m_emu = nullptr; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_fade_length = settings.value("GME/fadeout_length", 7000).toInt(); @@ -37,41 +37,41 @@ GmeHelper::~GmeHelper() { if(m_emu) gme_delete(m_emu); - m_emu = 0; + m_emu = nullptr; } Music_Emu *GmeHelper::load(const QString &url, int sample_rate) { if(m_emu) gme_delete(m_emu); - m_emu = 0; + m_emu = nullptr; QString path = url; if(url.contains("://")) { path.remove("gme://"); path.remove(QRegExp("#\\d+$")); } - const char *err = 0; + const char *err = nullptr; gme_type_t file_type; if((err = gme_identify_file(qPrintable(path),&file_type))) { qWarning("GmeHelper: %s", err); - return 0; + return nullptr; } if(!file_type) { qWarning("DecoderGme: unsupported music type"); - return 0; + return nullptr; } if(!(m_emu = gme_new_emu(file_type, sample_rate))) { qWarning("GmeHelper: out of memory"); - return 0; + return nullptr; } if((err = gme_load_file(m_emu, qPrintable(path)))) { qWarning("GmeHelper: %s", err); - return 0; + return nullptr; } QString m3u_path = path.left(path.lastIndexOf(".")); m3u_path.append(".m3u"); diff --git a/src/plugins/Input/gme/settingsdialog.h b/src/plugins/Input/gme/settingsdialog.h index c320153b7..5b4df41da 100644 --- a/src/plugins/Input/gme/settingsdialog.h +++ b/src/plugins/Input/gme/settingsdialog.h @@ -32,7 +32,7 @@ class SettingsDialog : public QDialog Q_OBJECT public: - explicit SettingsDialog(QWidget *parent = 0); + explicit SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); public slots: diff --git a/src/plugins/Input/modplug/archivereader.h b/src/plugins/Input/modplug/archivereader.h index 3357e1142..7a714e385 100644 --- a/src/plugins/Input/modplug/archivereader.h +++ b/src/plugins/Input/modplug/archivereader.h @@ -32,7 +32,7 @@ class ArchiveReader : public QObject { Q_OBJECT public: - ArchiveReader(QObject *parent = 0); + ArchiveReader(QObject *parent = nullptr); ~ArchiveReader(); diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 2c386e7ee..a2924c183 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -39,16 +39,16 @@ // Decoder class -DecoderModPlug* DecoderModPlug::m_instance = 0; +DecoderModPlug* DecoderModPlug::m_instance = nullptr; -DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(0) +DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(nullptr) { m_path = path; m_freq = 0; m_bitrate = 0; m_totalTime = 0; m_chan = 0; - m_soundFile = 0; + m_soundFile = nullptr; m_sampleSize = 0; m_instance = this; m_bps = 0; @@ -60,7 +60,7 @@ DecoderModPlug::~DecoderModPlug() { deinit(); if(m_instance == this) - m_instance = 0; + m_instance = nullptr; } bool DecoderModPlug::initialize() @@ -166,7 +166,7 @@ void DecoderModPlug::deinit() { m_soundFile->Destroy(); delete m_soundFile; - m_soundFile = 0; + m_soundFile = nullptr; } m_input_buf.clear(); } diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 1e3174e88..bcba93e9c 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -73,7 +73,7 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr QByteArray buffer; - ArchiveReader reader(0); + ArchiveReader reader(nullptr); if (reader.isSupported(path)) { buffer = reader.unpack(path); diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index 059901e71..9d4248dd6 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -31,7 +31,7 @@ ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path) : MetaDataModel(true) { - m_soundFile = 0; + m_soundFile = nullptr; m_path = path; ArchiveReader reader(nullptr); if(reader.isSupported(m_path)) diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h index e154aaa32..bbd73129f 100644 --- a/src/plugins/Input/modplug/settingsdialog.h +++ b/src/plugins/Input/modplug/settingsdialog.h @@ -32,7 +32,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 3df2165b3..714ed0d89 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -66,7 +66,7 @@ DecoderMPC::DecoderMPC(QIODevice *i) m_len = 0; m_bitrate = 0; m_totalTime = 0.0; - m_data = 0; + m_data = nullptr; } DecoderMPC::~DecoderMPC() @@ -77,7 +77,7 @@ DecoderMPC::~DecoderMPC() if(m_data->demuxer) mpc_demux_exit(m_data->demuxer); delete m_data; - m_data = 0; + m_data = nullptr; } } diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index fd7b56481..3326bba6e 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp @@ -174,7 +174,7 @@ void MPCFileTagModel::setValue(Qmmp::MetaData key, const QString &value) bool MPCFileTagModel::exists() const { - return (m_tag != 0); + return (m_tag != nullptr); } void MPCFileTagModel::create() @@ -189,7 +189,7 @@ void MPCFileTagModel::create() void MPCFileTagModel::remove() { - m_tag = 0; + m_tag = nullptr; } void MPCFileTagModel::save() diff --git a/src/plugins/Input/mpeg/decoder_mad.cpp b/src/plugins/Input/mpeg/decoder_mad.cpp index d7625fc70..4e984db58 100644 --- a/src/plugins/Input/mpeg/decoder_mad.cpp +++ b/src/plugins/Input/mpeg/decoder_mad.cpp @@ -41,7 +41,7 @@ DecoderMAD::DecoderMAD(QIODevice *i) : Decoder(i) m_bitrate = 0; m_freq = 0; m_len = 0; - m_input_buf = 0; + m_input_buf = nullptr; m_input_bytes = 0; m_skip_frames = 0; m_eof = false; @@ -56,7 +56,7 @@ DecoderMAD::~DecoderMAD() { qDebug("DecoderMAD: deleting input_buf"); delete [] m_input_buf; - m_input_buf = 0; + m_input_buf = nullptr; } } @@ -98,7 +98,7 @@ bool DecoderMAD::initialize() mad_stream_buffer(&m_stream, (unsigned char *) m_input_buf, m_input_bytes); m_stream.error = MAD_ERROR_BUFLEN; mad_frame_mute (&m_frame); - m_stream.next_frame = 0; + m_stream.next_frame = nullptr; m_stream.sync = 0; ChannelMap map; if(m_channels == 1) @@ -131,7 +131,7 @@ void DecoderMAD::deinit() if(m_xing.lame) { delete m_xing.lame; - m_xing.lame = 0; + m_xing.lame = nullptr; } } @@ -204,17 +204,17 @@ bool DecoderMAD::findXingHeader(struct mad_bitptr ptr, unsigned int bitlen) DecoderMAD::LameHeader* DecoderMAD::findLameHeader(mad_bitptr ptr, unsigned int bitlen) { if(bitlen < 272) - return 0; + return nullptr; if(mad_bit_read (&ptr, 32) != LAME_MAGIC) - return 0; + return nullptr; LameHeader header; mad_bit_skip (&ptr, 40); //version header.revision = mad_bit_read (&ptr, 4); if (header.revision == 15) - return 0; + return nullptr; mad_bit_skip(&ptr, 12); //VBR,Lowpass filter value header.peak = mad_bit_read(&ptr, 32) << 5; //Peak amplitude @@ -428,7 +428,7 @@ void DecoderMAD::seek(qint64 pos) m_stream.error = MAD_ERROR_BUFLEN; m_stream.sync = 0; m_input_bytes = 0; - m_stream.next_frame = 0; + m_stream.next_frame = nullptr; m_skip_frames = 2; m_skip_bytes = 0; m_play_bytes = -1; diff --git a/src/plugins/Input/mpeg/decoder_mad.h b/src/plugins/Input/mpeg/decoder_mad.h index 9768213a1..8980f1768 100644 --- a/src/plugins/Input/mpeg/decoder_mad.h +++ b/src/plugins/Input/mpeg/decoder_mad.h @@ -89,7 +89,7 @@ private: frames = 0; bytes = 0; scale = 0; - lame = 0; + lame = nullptr; } }; XingHeader m_xing; diff --git a/src/plugins/Input/mpeg/decoder_mpg123.cpp b/src/plugins/Input/mpeg/decoder_mpg123.cpp index 8c6c0cf27..9a1a5f18b 100644 --- a/src/plugins/Input/mpeg/decoder_mpg123.cpp +++ b/src/plugins/Input/mpeg/decoder_mpg123.cpp @@ -66,14 +66,14 @@ DecoderMPG123::DecoderMPG123(QIODevice *i) : Decoder(i) m_rate = 0; m_frame_info.bitrate = 0; m_mpg123_encoding = MPG123_ENC_SIGNED_16; - m_handle = 0; + m_handle = nullptr; m_errors = 0; } DecoderMPG123::~DecoderMPG123() { cleanup(m_handle); - m_handle = 0; + m_handle = nullptr; } bool DecoderMPG123::initialize() @@ -94,7 +94,7 @@ bool DecoderMPG123::initialize() } int channels = 0; - if(!(m_handle = mpg123_new(0, &err))) + if(!(m_handle = mpg123_new(nullptr, &err))) { qWarning("DecoderMPG123: basic setup goes wrong: %s", mpg123_plain_strerror(err)); return false; @@ -102,11 +102,11 @@ bool DecoderMPG123::initialize() mpg123_param (m_handle, MPG123_ADD_FLAGS, MPG123_SEEKBUFFER | MPG123_FUZZY, 0); - if((err = mpg123_replace_reader_handle(m_handle, mpg123_read_cb, mpg123_seek_cb, 0)) != MPG123_OK) + if((err = mpg123_replace_reader_handle(m_handle, mpg123_read_cb, mpg123_seek_cb, nullptr)) != MPG123_OK) { qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err)); cleanup(m_handle); - m_handle = 0; + m_handle = nullptr; return false; } setMPG123Format(MPG123_ENC_FLOAT_32); @@ -115,7 +115,7 @@ bool DecoderMPG123::initialize() { qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err)); cleanup(m_handle); - m_handle = 0; + m_handle = nullptr; return false; } @@ -123,7 +123,7 @@ bool DecoderMPG123::initialize() { qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err)); cleanup(m_handle); - m_handle = 0; + m_handle = nullptr; return false; } //check format @@ -131,7 +131,7 @@ bool DecoderMPG123::initialize() { cleanup(m_handle); qWarning("DecoderMPG123: bad encoding: 0x%x!\n", m_mpg123_encoding); - m_handle = 0; + m_handle = nullptr; return false; } diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index 0c1356262..a251fc750 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -136,7 +136,7 @@ bool DecoderMPEGFactory::canDecode(QIODevice *input) const if (decoderName != "mpg123") { mpg123_init(); - mpg123_handle *handle = mpg123_new(0, 0); + mpg123_handle *handle = mpg123_new(nullptr, nullptr); if (!handle) return false; if(mpg123_open_feed(handle) != MPG123_OK) @@ -151,7 +151,7 @@ bool DecoderMPEGFactory::canDecode(QIODevice *input) const return false; } size_t out_size = 0; - int ret = mpg123_decode(handle, (unsigned char*) buf, dataSize, 0, 0, &out_size); + int ret = mpg123_decode(handle, (unsigned char*) buf, dataSize, nullptr, 0, &out_size); mpg123_close(handle); mpg123_delete(handle); return ret == MPG123_DONE || ret == MPG123_NEW_FORMAT; @@ -175,7 +175,7 @@ DecoderProperties DecoderMPEGFactory::properties() const Decoder *DecoderMPEGFactory::create(const QString &, QIODevice *input) { - Decoder *d = 0; + Decoder *d = nullptr; #if defined(WITH_MAD) && defined(WITH_MPG123) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if(settings.value("MPEG/decoder", "mad").toString() == "mpg123") @@ -203,7 +203,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track if(parts == TrackInfo::NoParts) return QList<TrackInfo*>() << info; - TagLib::Tag *tag = 0; + TagLib::Tag *tag = nullptr; TagLib::FileStream stream(QStringToFileName(path), true); TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); @@ -212,7 +212,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("MPEG"); - QTextCodec *codec = 0; + QTextCodec *codec = nullptr; uint tag_array[3]; tag_array[0] = settings.value("tag_1", SettingsDialog::ID3v2).toInt(); @@ -324,7 +324,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track if(fileRef.ID3v2Tag() && !fileRef.ID3v2Tag()->isEmpty()) { TagLib::ID3v2::Tag *tag = fileRef.ID3v2Tag(); - TagLib::ID3v2::UserTextIdentificationFrame* frame = 0; + TagLib::ID3v2::UserTextIdentificationFrame *frame = nullptr; TagLib::ID3v2::FrameList frames = tag->frameList("TXXX"); for(TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it) { diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index d4760ea88..a960a15a3 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -380,7 +380,7 @@ void MpegFileTagModel::setValue(Qmmp::MetaData key, const QString &value) bool MpegFileTagModel::exists() const { - return (m_tag != 0); + return (m_tag != nullptr); } void MpegFileTagModel::create() @@ -397,7 +397,7 @@ void MpegFileTagModel::create() void MpegFileTagModel::remove() { - m_tag = 0; + m_tag = nullptr; } void MpegFileTagModel::save() diff --git a/src/plugins/Input/mpeg/settingsdialog.h b/src/plugins/Input/mpeg/settingsdialog.h index cdebaa15a..1a08d76f3 100644 --- a/src/plugins/Input/mpeg/settingsdialog.h +++ b/src/plugins/Input/mpeg/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(bool using_rusxmms, QWidget *parent = 0); + SettingsDialog(bool using_rusxmms, QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/mpeg/tagextractor.cpp b/src/plugins/Input/mpeg/tagextractor.cpp index 1e1557947..948b57f67 100644 --- a/src/plugins/Input/mpeg/tagextractor.cpp +++ b/src/plugins/Input/mpeg/tagextractor.cpp @@ -59,7 +59,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag() settings.beginGroup("MPEG"); QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray (); bool utf = false; - QTextCodec *codec = 0; + QTextCodec *codec = nullptr; if (name.contains("UTF")) { codec = QTextCodec::codecForName ("UTF-8"); diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp index 1c68f7e55..92852afef 100644 --- a/src/plugins/Input/opus/decoder_opus.cpp +++ b/src/plugins/Input/opus/decoder_opus.cpp @@ -67,7 +67,7 @@ static opus_int64 opustell(void *src) DecoderOpus::DecoderOpus(const QString &url, QIODevice *i) : Decoder(i) { m_totalTime = 0; - m_opusfile = 0; + m_opusfile = nullptr; m_chan = 0; m_bitrate = 0; m_url = url; @@ -77,7 +77,7 @@ DecoderOpus::~DecoderOpus() { if (m_opusfile) op_free(m_opusfile); - m_opusfile = 0; + m_opusfile = nullptr; } bool DecoderOpus::initialize() @@ -97,9 +97,9 @@ bool DecoderOpus::initialize() opusread, opusseek, opustell, - 0, + nullptr, }; - m_opusfile = op_open_callbacks(this, &opuscb, 0, 0, 0); + m_opusfile = op_open_callbacks(this, &opuscb, nullptr, 0, nullptr); if (!m_opusfile) { @@ -150,7 +150,7 @@ void DecoderOpus::seek(qint64 time) qint64 DecoderOpus::read(unsigned char *data, qint64 maxSize) { - int frames = op_read_float(m_opusfile, (float*) data, maxSize / sizeof(float), 0); + int frames = op_read_float(m_opusfile, (float*) data, maxSize / sizeof(float), nullptr); m_bitrate = op_bitrate_instant(m_opusfile) / 1000; return frames * m_chan * sizeof(float); } diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp index 6fa67f577..889c762d3 100644 --- a/src/plugins/Input/sid/decoder_sid.cpp +++ b/src/plugins/Input/sid/decoder_sid.cpp @@ -32,7 +32,7 @@ #include "decoder_sid.h" // Decoder class -DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(0) +DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(nullptr) { m_db = db; m_url = url; @@ -102,7 +102,7 @@ bool DecoderSID::initialize() qDebug("DecoderSID: song length: %d", m_length); - sidbuilder *rs = 0; + sidbuilder *rs = nullptr; if(settings.value("engine", "residfp").toString() == "residfp") { rs = new ReSIDfpBuilder("ReSIDfp builder"); diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index fa54057d8..c30c7ff6b 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -100,7 +100,7 @@ MetaDataModel* DecoderSIDFactory::createMetaDataModel(const QString &path, bool { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderSIDFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/sid/settingsdialog.h b/src/plugins/Input/sid/settingsdialog.h index 8bbdf3fec..01f784692 100644 --- a/src/plugins/Input/sid/settingsdialog.h +++ b/src/plugins/Input/sid/settingsdialog.h @@ -31,7 +31,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(SidDatabase *db, QWidget *parent = 0); + SettingsDialog(SidDatabase *db, QWidget *parent = nullptr); virtual ~SettingsDialog(); diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp index 999edcbcf..9700b671f 100644 --- a/src/plugins/Input/sid/sidhelper.cpp +++ b/src/plugins/Input/sid/sidhelper.cpp @@ -24,7 +24,7 @@ SIDHelper::SIDHelper(SidDatabase *db) { - m_tune = 0; + m_tune = nullptr; m_db = db; } @@ -32,7 +32,7 @@ SIDHelper::~SIDHelper() { if(m_tune) delete m_tune; - m_tune = 0; + m_tune = nullptr; } SidTune *SIDHelper::load(const QString &url) @@ -40,7 +40,7 @@ SidTune *SIDHelper::load(const QString &url) if(m_tune) { delete m_tune; - m_tune = 0; + m_tune = nullptr; } QString path = url; int track = 1; diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index d90859454..45607cb24 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -79,7 +79,7 @@ DecoderSndFile::DecoderSndFile(QIODevice *input) : Decoder(input) //m_path = input; m_bitrate = 0; m_totalTime = 0; - m_sndfile = 0; + m_sndfile = nullptr; m_freq = 0; } @@ -118,7 +118,7 @@ bool DecoderSndFile::initialize() m_bitrate = input()->size () * 8.0 / m_totalTime + 0.5; if((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT) - sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE); + sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, nullptr, SF_TRUE); configure(m_freq, chan, Qmmp::PCM_S16LE); qDebug("DecoderSndFile: detected format: %08X", snd_info.format); @@ -133,7 +133,7 @@ void DecoderSndFile::deinit() m_freq = 0; if (m_sndfile) sf_close(m_sndfile); - m_sndfile = 0; + m_sndfile = nullptr; } qint64 DecoderSndFile::totalTime() const diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index f786e091a..23084bb63 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -141,7 +141,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr return QList<TrackInfo*>() << info; SF_INFO snd_info; - SNDFILE *sndfile = 0; + SNDFILE *sndfile = nullptr; memset(&snd_info, 0, sizeof(snd_info)); snd_info.format = 0; #ifdef Q_OS_WIN @@ -201,7 +201,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr SF_FORMAT_INFO format_info; memset(&format_info, 0, sizeof(format_info)); format_info.format = (snd_info.format & SF_FORMAT_TYPEMASK); - sf_command(0, SFC_GET_FORMAT_INFO, &format_info, sizeof(format_info)); + sf_command(nullptr, SFC_GET_FORMAT_INFO, &format_info, sizeof(format_info)); info->setValue(Qmmp::FORMAT_NAME, QString::fromLatin1(format_info.name)); info->setDuration(int(snd_info.frames * 1000 / snd_info.samplerate)); } @@ -212,7 +212,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr MetaDataModel* DecoderSndFileFactory::createMetaDataModel(const QString&, bool) { - return 0; + return nullptr; } void DecoderSndFileFactory::showSettings(QWidget *) @@ -221,7 +221,7 @@ void DecoderSndFileFactory::showSettings(QWidget *) void DecoderSndFileFactory::showAbout(QWidget *parent) { char version [128] = { 0 }; - sf_command (NULL, SFC_GET_LIB_VERSION, version, sizeof (version)) ; + sf_command (nullptr, SFC_GET_LIB_VERSION, version, sizeof (version)) ; QMessageBox::about (parent, tr("About Sndfile Audio Plugin"), tr("Qmmp Sndfile Audio Plugin")+"\n"+ tr("Compiled against")+" "+QString(version)+"\n" + diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index 063398500..37f795192 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -103,7 +103,7 @@ bool DecoderVorbis::initialize() oggclose, oggtell }; - if (ov_open_callbacks(this, &oggfile, NULL, 0, oggcb) < 0) + if (ov_open_callbacks(this, &oggfile, nullptr, 0, oggcb) < 0) { qWarning("DecoderVorbis: cannot open stream"); @@ -285,7 +285,7 @@ void DecoderVorbis::seek(qint64 time) qint64 DecoderVorbis::read(unsigned char *data, qint64 maxSize) { len = -1; - float **pcm = 0; + float **pcm = nullptr; int section = 0; while (len < 0) len = ov_read_float(&oggfile, &pcm, maxSize/sizeof(float), §ion); diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index e97e1b95b..5ca7a1c50 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -38,9 +38,9 @@ DecoderWavPack::DecoderWavPack(const QString &path) m_path = path; m_totalTime = 0.0; m_chan = 0; - m_context = 0; - m_parser = 0; - m_output_buf = 0; + m_context = nullptr; + m_parser = nullptr; + m_output_buf = nullptr; m_length_in_bytes = 0; m_totalBytes = 0; m_frame_size = 0; @@ -54,7 +54,7 @@ DecoderWavPack::~DecoderWavPack() deinit(); if (m_output_buf) delete [] m_output_buf; - m_output_buf = 0; + m_output_buf = nullptr; } bool DecoderWavPack::initialize() @@ -79,7 +79,7 @@ bool DecoderWavPack::initialize() qWarning("DecoderWavPack: error: %s", err); return false; } - int cue_len = WavpackGetTagItem (m_context, "cuesheet", NULL, 0); + int cue_len = WavpackGetTagItem (m_context, "cuesheet", nullptr, 0); char *value; if (cue_len) { @@ -173,10 +173,10 @@ void DecoderWavPack::deinit() m_chan = 0; if (m_context) WavpackCloseFile (m_context); - m_context = 0; + m_context = nullptr; if(m_parser) delete m_parser; - m_parser = 0; + m_parser = nullptr; } void DecoderWavPack::seek(qint64 time) diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index f63ccc54d..139fe7494 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -96,7 +96,7 @@ QList<TrackInfo *> DecoderWavPackFactory::createPlayList(const QString &path, Tr if(parts & TrackInfo::MetaData) { - cue_len = WavpackGetTagItem (ctx, "cuesheet", NULL, 0); + cue_len = WavpackGetTagItem (ctx, "cuesheet", nullptr, 0); if (cue_len) { delete info; @@ -165,7 +165,7 @@ MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, b if (!path.contains("://") || path.startsWith("wvpack://")) return new WavPackMetaDataModel(path, readOnly); else - return 0; + return nullptr; } void DecoderWavPackFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp index 198175d4c..f3c2e459c 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp @@ -26,7 +26,7 @@ DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder() { m_path = path; - midi_ptr = 0; + midi_ptr = nullptr; m_sample_rate = 0; } diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index c57d14c49..540846af5 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp @@ -92,7 +92,7 @@ MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path, { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderWildMidiFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/wildmidi/settingsdialog.h b/src/plugins/Input/wildmidi/settingsdialog.h index 2b706f1f3..d190ebe7d 100644 --- a/src/plugins/Input/wildmidi/settingsdialog.h +++ b/src/plugins/Input/wildmidi/settingsdialog.h @@ -31,7 +31,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp index 612e544f7..812930561 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.cpp +++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp @@ -26,7 +26,7 @@ extern "C"{ #include <qmmp/qmmp.h> #include "wildmidihelper.h" -WildMidiHelper *WildMidiHelper::m_instance = 0; +WildMidiHelper *WildMidiHelper::m_instance = nullptr; WildMidiHelper::WildMidiHelper(QObject *parent) : QObject(parent) @@ -40,7 +40,7 @@ WildMidiHelper::~WildMidiHelper() { if(m_inited) WildMidi_Shutdown(); - m_instance = 0; + m_instance = nullptr; } bool WildMidiHelper::initialize() diff --git a/src/plugins/Input/wildmidi/wildmidihelper.h b/src/plugins/Input/wildmidi/wildmidihelper.h index 9c4141ecd..7d50775c7 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.h +++ b/src/plugins/Input/wildmidi/wildmidihelper.h @@ -29,7 +29,7 @@ class WildMidiHelper : public QObject { Q_OBJECT public: - explicit WildMidiHelper(QObject *parent = 0); + explicit WildMidiHelper(QObject *parent = nullptr); ~WildMidiHelper(); bool initialize(); void readSettings(); |
