Permalink
Browse files

remove unnecessary folder creation on startup

  • Loading branch information...
1 parent 7bb063a commit 20fcaaec1353fd77e00f0422a05d43cd4f00567a Jonathan Marshall committed Jul 6, 2012
Showing with 0 additions and 70 deletions.
  1. +0 −65 xbmc/settings/Settings.cpp
  2. +0 −5 xbmc/settings/Settings.h
View
@@ -1676,39 +1676,6 @@ CStdString CSettings::GetThumbnailsFolder() const
return folder;
}
-CStdString CSettings::GetMusicThumbFolder() const
-{
- CStdString folder;
- if (GetCurrentProfile().hasDatabases())
- URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "Thumbnails/Music", folder);
- else
- URIUtils::AddFileToFolder(GetUserDataFolder(), "Thumbnails/Music", folder);
-
- return folder;
-}
-
-CStdString CSettings::GetLastFMThumbFolder() const
-{
- CStdString folder;
- if (GetCurrentProfile().hasDatabases())
- URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "Thumbnails/Music/LastFM", folder);
- else
- URIUtils::AddFileToFolder(GetUserDataFolder(), "Thumbnails/Music/LastFM", folder);
-
- return folder;
-}
-
-CStdString CSettings::GetMusicArtistThumbFolder() const
-{
- CStdString folder;
- if (GetCurrentProfile().hasDatabases())
- URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "Thumbnails/Music/Artists", folder);
- else
- URIUtils::AddFileToFolder(GetUserDataFolder(), "Thumbnails/Music/Artists", folder);
-
- return folder;
-}
-
CStdString CSettings::GetVideoThumbFolder() const
{
CStdString folder;
@@ -1720,28 +1687,6 @@ CStdString CSettings::GetVideoThumbFolder() const
return folder;
}
-CStdString CSettings::GetVideoFanartFolder() const
-{
- CStdString folder;
- if (GetCurrentProfile().hasDatabases())
- URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "Thumbnails/Video/Fanart", folder);
- else
- URIUtils::AddFileToFolder(GetUserDataFolder(), "Thumbnails/Video/Fanart", folder);
-
- return folder;
-}
-
-CStdString CSettings::GetMusicFanartFolder() const
-{
- CStdString folder;
- if (GetCurrentProfile().hasDatabases())
- URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "Thumbnails/Music/Fanart", folder);
- else
- URIUtils::AddFileToFolder(GetUserDataFolder(), "Thumbnails/Music/Fanart", folder);
-
- return folder;
-}
-
CStdString CSettings::GetBookmarksThumbFolder() const
{
CStdString folder;
@@ -1840,24 +1785,14 @@ void CSettings::CreateProfileFolders()
// Thumbnails/
CDirectory::Create(GetThumbnailsFolder());
- CDirectory::Create(GetMusicThumbFolder());
- CDirectory::Create(GetMusicArtistThumbFolder());
- CDirectory::Create(GetLastFMThumbFolder());
CDirectory::Create(GetVideoThumbFolder());
- CDirectory::Create(GetVideoFanartFolder());
- CDirectory::Create(GetMusicFanartFolder());
CDirectory::Create(GetBookmarksThumbFolder());
- CStdString generatedThumbsFolder = URIUtils::AddFileToFolder(GetThumbnailsFolder(), "generated");
- CDirectory::Create(generatedThumbsFolder);
CLog::Log(LOGINFO, "thumbnails folder: %s", GetThumbnailsFolder().c_str());
for (unsigned int hex=0; hex < 16; hex++)
{
CStdString strHex;
strHex.Format("%x",hex);
- CDirectory::Create(URIUtils::AddFileToFolder(GetMusicThumbFolder(), strHex));
- CDirectory::Create(URIUtils::AddFileToFolder(GetVideoThumbFolder(), strHex));
CDirectory::Create(URIUtils::AddFileToFolder(GetThumbnailsFolder(), strHex));
- CDirectory::Create(URIUtils::AddFileToFolder(generatedThumbsFolder, strHex));
}
CDirectory::Create("special://profile/addon_data");
CDirectory::Create("special://profile/keymaps");
View
@@ -345,14 +345,9 @@ class CSettings
CStdString GetDatabaseFolder() const;
CStdString GetCDDBFolder() const;
CStdString GetThumbnailsFolder() const;
- CStdString GetMusicThumbFolder() const;
- CStdString GetLastFMThumbFolder() const;
- CStdString GetMusicArtistThumbFolder() const;
CStdString GetVideoThumbFolder() const;
CStdString GetBookmarksThumbFolder() const;
CStdString GetSourcesFile() const;
- CStdString GetVideoFanartFolder() const;
- CStdString GetMusicFanartFolder() const;
CStdString GetSettingsFile() const;

0 comments on commit 20fcaae

Please sign in to comment.