aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornight199uk <night199uk@xbmc.org>2013-08-15 23:11:25 +0800
committerJonathan Marshall <jmarshall@xbmc.org>2013-12-24 13:48:48 +1300
commite0e666104924603870f72d5e79338c4f901e31db (patch)
treed516f8cdf1c878f443af574d77b4b7e7e527c77c
parentfd6c595b997a9b5d38e581bcf22c50d4a93e3e79 (diff)
[musicdb] cosmetic: fix some constness cosmetics
-rw-r--r--xbmc/music/infoscanner/MusicInfoScanner.cpp16
-rw-r--r--xbmc/music/infoscanner/MusicInfoScanner.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index a57a35d7ee..9f20ed1a7d 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -1098,7 +1098,7 @@ loop:
#define THRESHOLD .95f
-INFO_RET CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album, ADDON::ScraperPtr& info, CMusicAlbumInfo& albumInfo, CGUIDialogProgress* pDialog)
+INFO_RET CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album, const ADDON::ScraperPtr& info, CMusicAlbumInfo& albumInfo, CGUIDialogProgress* pDialog)
{
if (m_handle)
{
@@ -1141,10 +1141,10 @@ INFO_RET CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album, ADDON::Scrape
{
CScraperUrl scrUrl(nfoReader.ScraperUrl());
CMusicAlbumInfo albumNfo("nfo",scrUrl);
- info = nfoReader.GetScraperInfo();
- CLog::Log(LOGDEBUG,"-- nfo-scraper: %s",info->Name().c_str());
+ ADDON::ScraperPtr nfoReaderScraper = nfoReader.GetScraperInfo();
+ CLog::Log(LOGDEBUG,"-- nfo-scraper: %s", nfoReaderScraper->Name().c_str());
CLog::Log(LOGDEBUG,"-- nfo url: %s", scrUrl.m_url[0].m_url.c_str());
- scraper.SetScraperInfo(info);
+ scraper.SetScraperInfo(nfoReaderScraper);
scraper.GetAlbums().clear();
scraper.GetAlbums().push_back(albumNfo);
}
@@ -1310,7 +1310,7 @@ void CMusicInfoScanner::GetAlbumArtwork(long id, const CAlbum &album)
}
}
-INFO_RET CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist, ADDON::ScraperPtr& info, MUSIC_GRABBER::CMusicArtistInfo& artistInfo, CGUIDialogProgress* pDialog)
+INFO_RET CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist, const ADDON::ScraperPtr& info, MUSIC_GRABBER::CMusicArtistInfo& artistInfo, CGUIDialogProgress* pDialog)
{
if (m_handle)
{
@@ -1353,10 +1353,10 @@ INFO_RET CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist, ADDON::Scr
{
CScraperUrl scrUrl(nfoReader.ScraperUrl());
CMusicArtistInfo artistNfo("nfo",scrUrl);
- info = nfoReader.GetScraperInfo();
- CLog::Log(LOGDEBUG,"-- nfo-scraper: %s",info->Name().c_str());
+ ADDON::ScraperPtr nfoReaderScraper = nfoReader.GetScraperInfo();
+ CLog::Log(LOGDEBUG,"-- nfo-scraper: %s",nfoReaderScraper->Name().c_str());
CLog::Log(LOGDEBUG,"-- nfo url: %s", scrUrl.m_url[0].m_url.c_str());
- scraper.SetScraperInfo(info);
+ scraper.SetScraperInfo(nfoReaderScraper);
scraper.GetArtists().push_back(artistNfo);
}
else
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h
index c43bd6d8a0..964ec26dbc 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.h
+++ b/xbmc/music/infoscanner/MusicInfoScanner.h
@@ -142,7 +142,7 @@ public:
\param albumInfo [in/out] a CMusicAlbumInfo struct which will be populated with the output of the scraper
\param pDialog [in] a progress dialog which this and downstream functions can update with status, if required
*/
- INFO_RET DownloadAlbumInfo(const CAlbum& album, ADDON::ScraperPtr& scraper, MUSIC_GRABBER::CMusicAlbumInfo& albumInfo, CGUIDialogProgress* pDialog = NULL);
+ INFO_RET DownloadAlbumInfo(const CAlbum& album, const ADDON::ScraperPtr& scraper, MUSIC_GRABBER::CMusicAlbumInfo& albumInfo, CGUIDialogProgress* pDialog = NULL);
/*! \brief Using the scrapers download metadata for an artist
Given a CAlbum style struct containing some data about an artist, query
@@ -154,7 +154,7 @@ public:
\param artistInfo [in/out] a CMusicAlbumInfo struct which will be populated with the output of the scraper
\param pDialog [in] a progress dialog which this and downstream functions can update with status, if required
*/
- INFO_RET DownloadArtistInfo(const CArtist& artist, ADDON::ScraperPtr& scraper, MUSIC_GRABBER::CMusicArtistInfo& artistInfo, CGUIDialogProgress* pDialog = NULL);
+ INFO_RET DownloadArtistInfo(const CArtist& artist, const ADDON::ScraperPtr& scraper, MUSIC_GRABBER::CMusicArtistInfo& artistInfo, CGUIDialogProgress* pDialog = NULL);
/*! \brief Search for art for an artist
Look for art for an artist. Checks the artist structure for thumbs, and checks