diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-07 20:51:46 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-03-07 20:51:46 +0000 |
| commit | 938655a26809d8f19ca9f51f4f4a0ddbde432455 (patch) | |
| tree | 98240e2070acfff42b503b9951a1a005d3f8c06b | |
| parent | d8257a78c303f310d1b05ea06e53d9819623a6f9 (diff) | |
| download | qmmp-938655a26809d8f19ca9f51f4f4a0ddbde432455.tar.gz qmmp-938655a26809d8f19ca9f51f4f4a0ddbde432455.tar.bz2 qmmp-938655a26809d8f19ca9f51f4f4a0ddbde432455.zip | |
cdaudio: removed unused code
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9273 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/cdaudio/decoder_cdaudio.cpp | 42 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/decoder_cdaudio.h | 3 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/settingsdialog.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/settingsdialog.h | 1 |
4 files changed, 0 insertions, 55 deletions
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 34bd8ec03..e469ec2f0 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QObject> #include <QRegExp> #include <QSettings> @@ -217,47 +216,6 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn return tracks; } -void DecoderCDAudio::saveToCache(QList <CDATrack> tracks, uint disc_id) -{ - QDir dir(Qmmp::configDir()); - if(!dir.exists("cddbcache")) - dir.mkdir("cddbcache"); - dir.cd("cddbcache"); - QString path = dir.absolutePath() + QString("/%1").arg(disc_id, 0, 16); - QSettings settings(path, QSettings::IniFormat); - settings.clear(); - settings.setValue("count", tracks.size()); - for(int i = 0; i < tracks.size(); ++i) - { - CDATrack track = tracks[i]; - QMap<Qmmp::MetaData, QString> meta = track.info.metaData(); - settings.setValue(QString("artist%1").arg(i), meta[Qmmp::ARTIST]); - settings.setValue(QString("title%1").arg(i), meta[Qmmp::TITLE]); - settings.setValue(QString("genre%1").arg(i), meta[Qmmp::GENRE]); - settings.setValue(QString("album%1").arg(i), meta[Qmmp::ALBUM]); - } -} - -bool DecoderCDAudio::readFromCache(QList <CDATrack> *tracks, uint disc_id) -{ - QString path = Qmmp::configDir(); - path += QString("/cddbcache/%1").arg(disc_id, 0, 16); - if(!QFile::exists(path)) - return false; - QSettings settings(path, QSettings::IniFormat); - int count = settings.value("count").toInt(); - if(count != tracks->count()) - return false; - for(int i = 0; i < count; ++i) - { - (*tracks)[i].info.setValue(Qmmp::ARTIST, settings.value(QString("artist%1").arg(i)).toString()); - (*tracks)[i].info.setValue(Qmmp::TITLE, settings.value(QString("title%1").arg(i)).toString()); - (*tracks)[i].info.setValue(Qmmp::GENRE, settings.value(QString("genre%1").arg(i)).toString()); - (*tracks)[i].info.setValue(Qmmp::ALBUM, settings.value(QString("album%1").arg(i)).toString()); - } - return true; -} - qint64 DecoderCDAudio::calculateTrackLength(lsn_t startlsn, lsn_t endlsn) { return ((endlsn - startlsn + 1) * 1000) / 75; diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h index 048f0bb1d..29ed8c3ff 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.h +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h @@ -59,9 +59,6 @@ public: void seek(qint64 time) override; private: - //helper functions - static void saveToCache(QList <CDATrack> tracks, uint disc_id); - static bool readFromCache(QList <CDATrack> *tracks, uint disc_id); // libcdio variables lsn_t m_first_sector; lsn_t m_last_sector; diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp index d86d88d35..5dfced4e0 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.cpp +++ b/src/plugins/Input/cdaudio/settingsdialog.cpp @@ -62,12 +62,3 @@ void SettingsDialog::accept() DecoderCDAudio::clearTrackCache(); QDialog::accept(); } - -void SettingsDialog::on_clearCacheButton_clicked() -{ - QDir dir(Qmmp::configDir()); - dir.cd("cddbcache"); - const QStringList list = dir.entryList(QStringList() << "*", QDir::Files); - for(const QString &name : qAsConst(list)) - dir.remove(name); -} diff --git a/src/plugins/Input/cdaudio/settingsdialog.h b/src/plugins/Input/cdaudio/settingsdialog.h index d20dfb879..919e108d3 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.h +++ b/src/plugins/Input/cdaudio/settingsdialog.h @@ -37,7 +37,6 @@ public: public slots: virtual void accept() override; - void on_clearCacheButton_clicked(); private: Ui::SettingsDialog m_ui; |
