From e9ba4fd3af495a21868b8c66d2b9943fad4f4a47 Mon Sep 17 00:00:00 2001
From: ace20022 <ace20022@ymail.com>
Date: Sat, 22 Sep 2018 10:57:54 +0200
Subject: Revert "[gui] Show a dvd/bluray icon for dvd/bluray folders."

This reverts commit 2a12e8275896b249ca9cabaf80f0ba66a9fe8e4b.
---
 xbmc/FileItem.cpp | 15 ---------------
 xbmc/FileItem.h   |  1 -
 2 files changed, 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;
-- 
cgit v1.2.3