Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove unnecessary use of threaded directory fetching

  • Loading branch information...
commit 550760d85a522d5147963eded4ff05fcde8e667e 1 parent d93e2ed
Jonathan Marshall authored
View
6 xbmc/FileItem.cpp
@@ -2874,11 +2874,11 @@ CStdString CFileItem::GetLocalFanart() const
return "";
CFileItemList items;
- CDirectory::GetDirectory(strDir, items, g_settings.m_pictureExtensions, DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO, true);
+ CDirectory::GetDirectory(strDir, items, g_settings.m_pictureExtensions, DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
if (IsOpticalMediaFile())
{ // grab from the optical media parent folder as well - see GetUserVideoThumb
CFileItemList moreItems;
- CDirectory::GetDirectory(GetLocalMetadataPath(), moreItems, g_settings.m_pictureExtensions, DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO, true);
+ CDirectory::GetDirectory(GetLocalMetadataPath(), moreItems, g_settings.m_pictureExtensions, DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
items.Append(moreItems);
}
@@ -3127,7 +3127,7 @@ CStdString CFileItem::FindTrailer() const
CStdString strDir;
URIUtils::GetDirectory(strFile, strDir);
CFileItemList items;
- CDirectory::GetDirectory(strDir, items, g_settings.m_videoExtensions, DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO, true);
+ CDirectory::GetDirectory(strDir, items, g_settings.m_videoExtensions, DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
URIUtils::RemoveExtension(strFile);
strFile += "-trailer";
CStdString strFile3 = URIUtils::AddFileToFolder(strDir, "movie-trailer");
View
2  xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
@@ -184,7 +184,7 @@ void CGUIDialogSmartPlaylistRule::OnBrowse()
CStdString path = "special://videoplaylists/";
if (m_type.Equals("songs") || m_type.Equals("albums"))
path = "special://musicplaylists/";
- XFILE::CDirectory::GetDirectory(path, items, ".xsp", XFILE::DIR_FLAG_NO_FILE_DIRS, true);
+ XFILE::CDirectory::GetDirectory(path, items, ".xsp", XFILE::DIR_FLAG_NO_FILE_DIRS);
for (int i = 0; i < items.Size(); i++)
{
CFileItemPtr item = items[i];
View
2  xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -278,7 +278,7 @@ void CGUIWindowVideoBase::OnInfo(CFileItem* pItem, const ADDON::ScraperPtr& scra
if (item.m_bIsFolder && scraper && scraper->Content() != CONTENT_TVSHOWS)
{
CFileItemList items;
- CDirectory::GetDirectory(item.GetPath(), items, g_settings.m_videoExtensions, DIR_FLAG_DEFAULTS,true);
+ CDirectory::GetDirectory(item.GetPath(), items, g_settings.m_videoExtensions);
items.Stack();
// check for media files
View
2  xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -683,7 +683,7 @@ void CGUIWindowVideoNav::OnDeleteItem(CFileItemPtr pItem)
if (pDialog->IsConfirmed())
{
CFileItemList items;
- CDirectory::GetDirectory(pItem->GetPath(),items,"",DIR_FLAG_NO_FILE_DIRS,true);
+ CDirectory::GetDirectory(pItem->GetPath(),items,"",DIR_FLAG_NO_FILE_DIRS);
for (int i=0;i<items.Size();++i)
OnDeleteItem(items[i]);
Please sign in to comment.
Something went wrong with that request. Please try again.