From 11f711119a348ea5bc85ed3c55ca052b4076b7fb Mon Sep 17 00:00:00 2001
From: Marcos CARDINOT <mcardinot@gmail.com>
Date: Sun, 18 May 2014 04:39:10 +0100
Subject: use defaultImageFormat as a member

---
 src/library/coverart.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/library/coverart.cpp')

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;
-- 
cgit v1.2.3