From 600735b0339a1854b2cc79784f2df687aea0e61e Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 8 Dec 2013 08:54:11 +0000 Subject: cdaudio: added disk cache git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3954 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cdaudio/decoder_cdaudio.cpp | 15 +++++++++++++++ src/plugins/Input/cdaudio/decoder_cdaudio.h | 3 +++ src/plugins/Input/cdaudio/settingsdialog.cpp | 3 +++ 3 files changed, 21 insertions(+) diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 0bd8b4f5e..88a22a2d6 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -43,6 +43,8 @@ #include "decoder_cdaudio.h" +QList DecoderCDAudio::m_track_cache; + static void log_handler (cdio_log_level_t level, const char message[]) { QString str = QString::fromLocal8Bit(message).trimmed(); @@ -133,6 +135,13 @@ QList DecoderCDAudio::generateTrackList(const QString &device) qDebug("DecoderCDAudio: using cd audio capable drive \"%s\"", qPrintable(device_path)); } + if(!m_track_cache.isEmpty() && !cdio_get_media_changed(cdio)) + { + qDebug("DecoderCDAudio: using track cache..."); + cdio_destroy(cdio); + return m_track_cache; + } + if (cd_speed) { qDebug("DecoderCDAudio: setting drive speed to %dX.", cd_speed); @@ -294,6 +303,7 @@ QList DecoderCDAudio::generateTrackList(const QString &device) cdio_destroy(cdio); cdio = 0; + m_track_cache = tracks; return tracks; } @@ -344,6 +354,11 @@ qint64 DecoderCDAudio::calculateTrackLength(lsn_t startlsn, lsn_t endlsn) return ((endlsn - startlsn + 1) * 1000) / 75; } +void DecoderCDAudio::clearTrackCache() +{ + m_track_cache.clear(); +} + bool DecoderCDAudio::initialize() { m_bitrate = 0; diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h index e84521bb6..50a87c161 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.h +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h @@ -48,6 +48,7 @@ public: static QList generateTrackList(const QString &device); static qint64 calculateTrackLength(lsn_t startlsn, lsn_t endlsn); + static void clearTrackCache(); // Standard Decoder API bool initialize(); @@ -71,6 +72,8 @@ private: qint64 m_totalTime; char *m_buffer; qint64 m_buffer_at; + //tracks cache + static QList m_track_cache; }; #endif // DECODER_CDAUIDO_H diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp index b41b86b7a..8404d43f9 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.cpp +++ b/src/plugins/Input/cdaudio/settingsdialog.cpp @@ -21,6 +21,7 @@ #include #include #include +#include "decoder_cdaudio.h" #include "settingsdialog.h" SettingsDialog::SettingsDialog(QWidget *parent) @@ -67,6 +68,8 @@ void SettingsDialog::accept() settings.setValue("cddb_path", ui.pathLineEdit->text()); settings.setValue("cddb_port", ui.portLineEdit->text()); settings.endGroup(); + settings.sync(); + DecoderCDAudio::clearCacheCache(); QDialog::accept(); } -- cgit v1.2.3-13-gbd6f