diff options
| -rw-r--r-- | src/plugins/Input/cue/cueparser.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Input/cue/cueparser.h | 12 | ||||
| -rw-r--r-- | src/plugins/Input/flac/cueparser.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/flac/cueparser.h | 10 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/cueparser.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/cueparser.h | 10 | ||||
| -rw-r--r-- | src/qmmp/qmmpaudioengine.cpp | 1 |
7 files changed, 31 insertions, 30 deletions
diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 20dc9ccf5..a5e1398d1 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -192,22 +192,22 @@ QList<FileInfo*> CUEParser::createPlayList() return list; } -const QString CUEParser::filePath(int track) +const QString CUEParser::filePath(int track) const { return (track <= m_files.size()) ? m_files[track - 1] : QString(); } -qint64 CUEParser::offset(int track) +qint64 CUEParser::offset(int track) const { return m_offsets.at(track - 1); } -qint64 CUEParser::length(int track) +qint64 CUEParser::length(int track) const { return m_infoList.at(track - 1).length(); } -int CUEParser::count() +int CUEParser::count() const { return m_infoList.count(); } diff --git a/src/plugins/Input/cue/cueparser.h b/src/plugins/Input/cue/cueparser.h index e48dc16aa..5c41a7811 100644 --- a/src/plugins/Input/cue/cueparser.h +++ b/src/plugins/Input/cue/cueparser.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -25,7 +25,7 @@ #include <QString> #include <QStringList> #include <QUrl> - +#include <qmmp/qmmp.h> #include <qmmp/fileinfo.h> @@ -40,10 +40,10 @@ public: ~CUEParser(); QList<FileInfo*> createPlayList(); - const QString filePath(int track); - qint64 offset(int track); - qint64 length(int track); - int count(); + const QString filePath(int track) const; + qint64 offset(int track) const; + qint64 length(int track) const; + int count() const; FileInfo *info(int track); const QString trackURL(int track); diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp index 13623867a..89c39c889 100644 --- a/src/plugins/Input/flac/cueparser.cpp +++ b/src/plugins/Input/flac/cueparser.cpp @@ -119,22 +119,22 @@ QList<FileInfo*> CUEParser::createPlayList() return list; } -const QString CUEParser::filePath() +const QString CUEParser::filePath() const { return m_filePath; } -qint64 CUEParser::offset(int track) +qint64 CUEParser::offset(int track) const { return m_offsets.at(track - 1); } -qint64 CUEParser::length(int track) +qint64 CUEParser::length(int track) const { return m_infoList.at(track - 1).length(); } -int CUEParser::count() +int CUEParser::count() const { return m_infoList.count(); } @@ -144,7 +144,7 @@ FileInfo *CUEParser::info(int track) return &m_infoList[track - 1]; } -const QString CUEParser::trackURL(int track) +const QString CUEParser::trackURL(int track) const { return m_infoList[track - 1].path(); } diff --git a/src/plugins/Input/flac/cueparser.h b/src/plugins/Input/flac/cueparser.h index 7491cf05d..5e4e0ea2d 100644 --- a/src/plugins/Input/flac/cueparser.h +++ b/src/plugins/Input/flac/cueparser.h @@ -40,12 +40,12 @@ public: ~CUEParser(); QList<FileInfo*> createPlayList(); - const QString filePath(); - qint64 offset(int track); - qint64 length(int track); - int count(); + const QString filePath() const; + qint64 offset(int track) const; + qint64 length(int track) const; + int count() const; FileInfo *info(int track); - const QString trackURL(int track); + const QString trackURL(int track) const; private: QString m_filePath; diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp index 39693ba8a..cc55c81a7 100644 --- a/src/plugins/Input/wavpack/cueparser.cpp +++ b/src/plugins/Input/wavpack/cueparser.cpp @@ -118,22 +118,22 @@ QList<FileInfo*> CUEParser::createPlayList() return list; } -const QString CUEParser::filePath() +const QString CUEParser::filePath() const { return m_filePath; } -qint64 CUEParser::offset(int track) +qint64 CUEParser::offset(int track) const { return m_offsets.at(track - 1); } -qint64 CUEParser::length(int track) +qint64 CUEParser::length(int track) const { return m_infoList.at(track - 1).length(); } -int CUEParser::count() +int CUEParser::count() const { return m_infoList.count(); } @@ -143,7 +143,7 @@ FileInfo *CUEParser::info(int track) return &m_infoList[track - 1]; } -const QString CUEParser::trackURL(int track) +const QString CUEParser::trackURL(int track) const { return m_infoList[track - 1].path(); } diff --git a/src/plugins/Input/wavpack/cueparser.h b/src/plugins/Input/wavpack/cueparser.h index fe3471c2c..a4b65dc11 100644 --- a/src/plugins/Input/wavpack/cueparser.h +++ b/src/plugins/Input/wavpack/cueparser.h @@ -40,12 +40,12 @@ public: ~CUEParser(); QList<FileInfo*> createPlayList(); - const QString filePath(); - qint64 offset(int track); - qint64 length(int track); - int count(); + const QString filePath() const; + qint64 offset(int track) const; + qint64 length(int track) const; + int count() const; FileInfo *info(int track); - const QString trackURL(int track); + const QString trackURL(int track) const; private: QString m_filePath; diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index abce71842..271442a7e 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -366,6 +366,7 @@ void QmmpAudioEngine::run() StateHandler::instance()->dispatch(Qmmp::Buffering); StateHandler::instance()->dispatch(Qmmp::Playing); m_decoder->next(); + m_replayGain->setReplayGainInfo(m_decoder->replayGainInfo()); m_output->seek(0); //reset counter addOffset(); //offset mutex()->unlock(); |
