diff options
| author | Andreas Zelend <ace20022@xbmc.org> | 2018-09-22 12:38:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 12:38:52 +0200 |
| commit | 067538b50084397f021ecea02e52f0d3825adbba (patch) | |
| tree | fbed20282127191488046945cb78aabccb6fe81a | |
| parent | e8567b3ebd8aa707a862c819e67bb9003f903f5b (diff) | |
| parent | e9ba4fd3af495a21868b8c66d2b9943fad4f4a47 (diff) | |
Merge pull request #14461 from ace20022/revert_disc_folder_icon
Revert "[gui] Show a dvd/bluray icon for dvd/bluray folders."
| -rw-r--r-- | xbmc/FileItem.cpp | 15 | ||||
| -rw-r--r-- | xbmc/FileItem.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp index 64993b4ac2..dd2d6bc1f3 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -1111,13 +1111,6 @@ bool CFileItem::IsDVDFile(bool bVobs /*= true*/, bool bIfos /*= true*/) const return false; } -bool CFileItem::IsDVDFolder() const -{ - CFileItem item = CFileItem(GetOpticalMediaPath(), false); - - return item.IsDVDFile(); -} - bool CFileItem::IsBDFile() const { std::string strFileName = URIUtils::GetFileName(m_strPath); @@ -1392,14 +1385,6 @@ void CFileItem::FillInDefaultIcon() { SetIconImage("DefaultFolderBack.png"); } - else if (IsBluray()) - { - SetIconImage("DefaultBluray.png"); - } - else if (IsDVDFolder()) - { - SetIconImage("DefaultDVDFull.png"); - } else { SetIconImage("DefaultFolder.png"); diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h index 35ff04ba9a..59e673bc17 100644 --- a/xbmc/FileItem.h +++ b/xbmc/FileItem.h @@ -200,7 +200,6 @@ public: bool IsDiscImage() const; bool IsOpticalMediaFile() const; bool IsDVDFile(bool bVobs = true, bool bIfos = true) const; - bool IsDVDFolder() const; bool IsBDFile() const; bool IsBluray() const; bool IsRAR() const; |