Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 0 insertions, 130 deletions

diff --git a/guilib/TextureBundle.cpp b/guilib/TextureBundle.cpp
deleted file mode 100644
index 006660fea4..0000000000
--- a/guilib/TextureBundle.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *      Copyright (C) 2005-2009 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "system.h"
-#include "TextureBundle.h"
-
-CTextureBundle::CTextureBundle(void)
-{
-  m_useXPR = false;
-  m_useXBT = false;
-}
-
-CTextureBundle::~CTextureBundle(void)
-{
-}
-
-bool CTextureBundle::HasFile(const CStdString& Filename)
-{
-  if (m_useXBT)
-  {
-    return m_tbXBT.HasFile(Filename);
-  }
-  else if (m_useXPR)
-  {
-    return m_tbXPR.HasFile(Filename);
-  }
-  else if (m_tbXBT.HasFile(Filename))
-  {
-    m_useXBT = true;
-    return true;
-  }
-  else if (m_tbXPR.HasFile(Filename))
-  {
-    m_useXPR = true;
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-void CTextureBundle::GetTexturesFromPath(const CStdString &path, std::vector<CStdString> &textures)
-{
-  if (m_useXBT)
-  {
-    m_tbXBT.GetTexturesFromPath(path, textures);
-  }
-  else if (m_useXPR)
-  {
-    m_tbXPR.GetTexturesFromPath(path, textures);
-  }
-}
-
-bool CTextureBundle::LoadTexture(const CStdString& Filename, CBaseTexture** ppTexture,
-                                     int &width, int &height)
-{
-  if (m_useXBT)
-  {
-    return m_tbXBT.LoadTexture(Filename, ppTexture, width, height);
-  }
-  else if (m_useXPR)
-  {
-    return m_tbXPR.LoadTexture(Filename, ppTexture, width, height);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-int CTextureBundle::LoadAnim(const CStdString& Filename, CBaseTexture*** ppTextures,
-                              int &width, int &height, int& nLoops, int** ppDelays)
-{
-  if (m_useXBT)
-  {
-    return m_tbXBT.LoadAnim(Filename, ppTextures, width, height, nLoops, ppDelays);
-  }
-  else if (m_useXPR)
-  {
-    return m_tbXPR.LoadAnim(Filename, ppTextures, width, height, nLoops, ppDelays);
-  }
-  else
-  {
-    return 0;
-  }
-}
-
-void CTextureBundle::Cleanup()
-{
-  if (m_useXBT)
-  {
-    m_tbXBT.Cleanup();
-  }
-  else if (m_useXPR)
-  {
-    m_tbXPR.Cleanup();
-  }
-
-  m_useXPR = m_useXBT = false;
-}
-
-void CTextureBundle::SetThemeBundle(bool themeBundle)
-{
-  m_tbXPR.SetThemeBundle(themeBundle);
-  m_tbXBT.SetThemeBundle(themeBundle);
-}
-
-CStdString CTextureBundle::Normalize(const CStdString &name)
-{
-  return CTextureBundleXBT::Normalize(name);
-}