diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/library/coverart.cpp | 11 | ||||
-rw-r--r-- | src/library/coverart.h | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp index 9bb2babbbb..c7321a2c6b 100644 --- a/src/library/coverart.cpp +++ b/src/library/coverart.cpp @@ -1,7 +1,8 @@ #include "library/coverart.h" CoverArt::CoverArt(ConfigObject<ConfigValue>* pConfig) - : m_pConfig(pConfig) { + : m_pConfig(pConfig), + m_cDefaultImageFormat("jpg") { if (!QDir().mkpath(getStoragePath())) { qDebug() << "WARNING: Could not create cover arts storage path. " << "Mixxx will be unable to store analyses."; @@ -26,8 +27,6 @@ bool CoverArt::deleteFile(const QString& location) { } QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) { - const char* defaultImageFormat = "jpg"; - // default cover art name QString coverArtName; QString artist = pTrack->getArtist(); @@ -54,7 +53,7 @@ QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) { } } coverArtLocation.append("."); - coverArtLocation.append(defaultImageFormat); + coverArtLocation.append(m_cDefaultImageFormat); // // Step 2: Look for embedded cover art. @@ -63,7 +62,7 @@ QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) { // If the track has embedded cover art, store it if (!image.isNull()) { - if(image.save(coverArtLocation, defaultImageFormat)) { + if(image.save(coverArtLocation, m_cDefaultImageFormat)) { return coverArtLocation; } } @@ -89,7 +88,7 @@ QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) { foreach (QRegExp re, regExpList) { if (filename.contains(re)) { QImage image(f.absoluteFilePath()); - if (image.save(coverArtLocation, defaultImageFormat)) { + if (image.save(coverArtLocation, m_cDefaultImageFormat)) { return coverArtLocation; } break; diff --git a/src/library/coverart.h b/src/library/coverart.h index 108d8e4f63..e75141a178 100644 --- a/src/library/coverart.h +++ b/src/library/coverart.h @@ -12,11 +12,13 @@ class CoverArt : public QObject { virtual ~CoverArt(); bool deleteFile(const QString& location); - QString searchCoverArtFile(TrackInfoObject *pTrack); + QString searchCoverArtFile(TrackInfoObject* pTrack); private: ConfigObject<ConfigValue>* m_pConfig; + const char* m_cDefaultImageFormat; + QString getStoragePath() const; }; |