cleanup: removed old unused osd code

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28318 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

15 files changed, 0 insertions, 1369 deletions

diff --git a/xbmc/osd/IExecutor.h b/xbmc/osd/IExecutor.h
deleted file mode 100644
index 21c58f9521..0000000000
--- a/xbmc/osd/IExecutor.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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
- *
- */
-
-namespace OSD
-{
-class IOSDOption;
-
-class IExecutor
-{
-public:
-  IExecutor(){};
-  virtual ~IExecutor(void){};
-  virtual void OnExecute(int iAction, const IOSDOption* option) = 0;
-};
-};
diff --git a/xbmc/osd/IOSDOption.cpp b/xbmc/osd/IOSDOption.cpp
deleted file mode 100644
index 30555ce190..0000000000
--- a/xbmc/osd/IOSDOption.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "IOSDOption.h"
-#include "IExecutor.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-IOSDOption::IOSDOption()
-{}
-
-IOSDOption::~IOSDOption(void)
-{}
diff --git a/xbmc/osd/IOSDOption.h b/xbmc/osd/IOSDOption.h
deleted file mode 100644
index 119796fcbb..0000000000
--- a/xbmc/osd/IOSDOption.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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
- *
- */
-
-namespace OSD
-{
-class IExecutor;
-class IOSDOption
-{
-public:
-  IOSDOption();
-  virtual ~IOSDOption(void);
-  virtual IOSDOption* Clone()const = 0 ;
-  virtual void Draw(int x, int y, bool bFocus = false, bool bSelected = false) = 0;
-  virtual bool OnAction(IExecutor& executor, const CAction& action) = 0;
-  virtual int GetMessage() const = 0;
-  virtual void SetValue(int iValue) = 0;
-  virtual void SetLabel(const CStdString& strLabel) = 0;
-protected:
-  int m_iHeading;
-};
-};
diff --git a/xbmc/osd/OSDMenu.cpp b/xbmc/osd/OSDMenu.cpp
deleted file mode 100644
index d40160025e..0000000000
--- a/xbmc/osd/OSDMenu.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "osdmenu.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-COSDMenu::COSDMenu()
-{
-  m_iCurrentSubMenu = 0;
-  m_iXPos = 0;
-  m_iYPos = 0;
-}
-
-COSDMenu::COSDMenu(int iXpos, int iYpos)
-{
-  m_iCurrentSubMenu = 0;
-  m_iXPos = iXpos;
-  m_iYPos = iYpos;
-}
-
-COSDMenu::COSDMenu(const COSDMenu& menu)
-{
-  *this = menu;
-}
-
-COSDMenu::~COSDMenu(void)
-{
-  Clear();
-}
-void COSDMenu::Clear()
-{
-  ivecSubMenus i = m_vecSubMenus.begin();
-  while (i != m_vecSubMenus.end())
-  {
-    COSDSubMenu* pSubMenu = *i;
-    delete pSubMenu;
-    i = m_vecSubMenus.erase(i);
-  }
-  m_iCurrentSubMenu = 0;
-}
-
-
-COSDMenu* COSDMenu::Clone()
-{
-  return new COSDMenu(*this);
-}
-
-
-const COSDMenu& COSDMenu::operator = (const COSDMenu& menu)
-{
-  if (&menu == this) return * this;
-  Clear();
-  icvecSubMenus i = menu.m_vecSubMenus.begin();
-  while (i != menu.m_vecSubMenus.end())
-  {
-    const COSDSubMenu* pSubMenu = *i;
-    m_vecSubMenus.push_back ( pSubMenu->Clone() );
-    ++i;
-  }
-
-  m_iCurrentSubMenu = menu.m_iCurrentSubMenu;
-  m_iXPos = menu.m_iXPos;
-  m_iYPos = menu.m_iYPos;
-  return *this;
-}
-
-
-void COSDMenu::Draw()
-{
-  // g_graphicsContext.Get3DDevice()->SetSoftDisplayFilter(true);
-  // g_graphicsContext.Get3DDevice()->SetFlickerFilter(5);
-
-  if (m_iCurrentSubMenu < 0 || m_iCurrentSubMenu >= (int) m_vecSubMenus.size())
-  {
-    m_iCurrentSubMenu = 0;
-    return ;
-  }
-  COSDSubMenu* pSubMenu = m_vecSubMenus[m_iCurrentSubMenu];
-  pSubMenu->Draw();
-
-
-  //  g_graphicsContext.Get3DDevice()->SetSoftDisplayFilter(g_stSettings.m_bSoften);
-  // g_graphicsContext.Get3DDevice()->SetFlickerFilter(g_stSettings.m_bSoften ? 5 : 1);
-}
-
-bool COSDMenu::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (m_iCurrentSubMenu < 0 || m_iCurrentSubMenu >= (int)m_vecSubMenus.size()) return false; // invalid choice.
-  COSDSubMenu* pSubMenu = m_vecSubMenus[m_iCurrentSubMenu];
-
-
-  if (pSubMenu->OnAction(executor, action)) return true;
-
-  if (action.wID == ACTION_OSD_SHOW_LEFT)
-  {
-    if ( m_iCurrentSubMenu > 0)
-    {
-      m_iCurrentSubMenu--;
-    }
-    else
-    {
-      m_iCurrentSubMenu = m_vecSubMenus.size() - 1;
-    }
-    return true;
-  }
-
-  if (action.wID == ACTION_OSD_SHOW_RIGHT)
-  {
-    if ( m_iCurrentSubMenu + 1 < (int)m_vecSubMenus.size() )
-    {
-      m_iCurrentSubMenu++;
-    }
-    else
-    {
-      m_iCurrentSubMenu = 0;
-    }
-    return true;
-  }
-
-  return false;
-}
-
-int COSDMenu::GetX() const
-{
-  return m_iXPos;
-}
-
-void COSDMenu::SetX(int X)
-{
-  m_iXPos = X;
-}
-
-int COSDMenu::GetY() const
-{
-  return m_iYPos;
-}
-
-void COSDMenu::SetY(int Y)
-{
-  m_iYPos = Y;
-}
-
-
-void COSDMenu::AddSubMenu(const COSDSubMenu& submenu)
-{
-  m_vecSubMenus.push_back( submenu.Clone() );
-}
-
-
-int COSDMenu::GetSelectedMenu() const
-{
-  return m_iCurrentSubMenu;
-}
-
-
-void COSDMenu::SetLabel(int iMessage, const CStdString& strLabel)
-{
-  for (int i = 0; i < (int)m_vecSubMenus.size(); ++i)
-  {
-    COSDSubMenu* pSubMenu = m_vecSubMenus[i];
-    pSubMenu->SetLabel(iMessage, strLabel);
-  }
-}
-void COSDMenu::SetValue(int iMessage, int iValue)
-{
-  for (int i = 0; i < (int)m_vecSubMenus.size(); ++i)
-  {
-    COSDSubMenu* pSubMenu = m_vecSubMenus[i];
-    pSubMenu->SetValue(iMessage, iValue);
-  }
-}
diff --git a/xbmc/osd/OSDOptionBoolean.cpp b/xbmc/osd/OSDOptionBoolean.cpp
deleted file mode 100644
index b807c0d975..0000000000
--- a/xbmc/osd/OSDOptionBoolean.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "OSDOptionBoolean.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-
-COSDOptionBoolean::COSDOptionBoolean(int iAction, int iHeading)
-    : m_image(0, 1, 0, 0, 0, 0, "check-box.png", "check-boxNF.png", 16, 16)
-{
-  m_bValue = false;
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-  m_image.SetShadow(true);
-}
-
-COSDOptionBoolean::COSDOptionBoolean(int iAction, int iHeading, bool bValue)
-    : m_image(0, 1, 0, 0, 0, 0, "check-box.png", "check-boxNF.png", 16, 16)
-{
-  m_iHeading = iHeading;
-  m_bValue = bValue;
-  m_iAction = iAction;
-  m_image.SetShadow(true);
-}
-
-COSDOptionBoolean::COSDOptionBoolean(const COSDOptionBoolean& option)
-    : m_image(0, 1, 0, 0, 0, 0, "check-box.png", "check-boxNF.png", 16, 16)
-{
-  *this = option;
-  m_image.SetShadow(true);
-}
-
-const OSD::COSDOptionBoolean& COSDOptionBoolean::operator = (const COSDOptionBoolean& option)
-{
-  if (this == &option) return * this;
-  m_bValue = option.m_bValue;
-  m_iHeading = option.m_iHeading;
-  m_iAction = option.m_iAction;
-  return *this;
-}
-
-COSDOptionBoolean::~COSDOptionBoolean(void)
-{}
-
-IOSDOption* COSDOptionBoolean::Clone() const
-{
-  return new COSDOptionBoolean(*this);
-}
-
-
-void COSDOptionBoolean::Draw(int x, int y, bool bFocus, bool bSelected)
-{
-  DWORD dwColor = 0xff999999;
-  if (bFocus)
-    dwColor = 0xffffffff;
-  CGUIFont* pFont13 = g_fontManager.GetFont("font13");
-  if (pFont13)
-  {
-    wstring strHeading = g_localizeStrings.Get(m_iHeading);
-    pFont13->DrawShadowText( (float)x, (float)y, dwColor,
-                             strHeading.c_str(), 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-  }
-
-  if (bSelected)
-  {
-    m_image.SetPosition(x + 200, y);
-    m_image.AllocResources();
-    m_image.SetSelected(m_bValue);
-    m_image.Render();
-    m_image.FreeResources();
-  }
-}
-
-bool COSDOptionBoolean::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (action.wID == ACTION_OSD_SHOW_SELECT)
-  {
-    m_bValue = !m_bValue;
-    executor.OnExecute(m_iAction, this);
-    return true;
-  }
-  return false;
-}
-
-bool COSDOptionBoolean::GetValue() const
-{
-  return m_bValue;
-}
diff --git a/xbmc/osd/OSDOptionBoolean.h b/xbmc/osd/OSDOptionBoolean.h
deleted file mode 100644
index 91aba7eaea..0000000000
--- a/xbmc/osd/OSDOptionBoolean.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "IOSDOption.h"
-#include "IExecutor.h"
-#include "GUICheckMarkControl.h"
-namespace OSD
-{
-class COSDOptionBoolean :
-      public IOSDOption
-{
-public:
-  COSDOptionBoolean(int iAction, int iHeading);
-  COSDOptionBoolean(int iAction, int iHeading, bool bValue);
-  COSDOptionBoolean(const COSDOptionBoolean& option);
-  const OSD::COSDOptionBoolean& operator = (const COSDOptionBoolean& option);
-
-
-  virtual ~COSDOptionBoolean(void);
-  virtual IOSDOption* Clone() const;
-  virtual void Draw(int x, int y, bool bFocus = false, bool bSelected = false);
-  virtual bool OnAction(IExecutor& executor, const CAction& action);
-  bool GetValue() const;
-  virtual int GetMessage() const { return m_iAction;};
-  virtual void SetValue(int iValue){};
-  virtual void SetLabel(const CStdString& strLabel){};
-private:
-  int m_iAction;
-  bool m_bValue;
-  CGUICheckMarkControl m_image;
-};
-};
diff --git a/xbmc/osd/OSDOptionButton.cpp b/xbmc/osd/OSDOptionButton.cpp
deleted file mode 100644
index 5ed7013e63..0000000000
--- a/xbmc/osd/OSDOptionButton.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "OSDOptionButton.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-
-COSDOptionButton::COSDOptionButton(int iAction, int iHeading)
-{
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-  m_strValue = "";
-}
-
-
-COSDOptionButton::COSDOptionButton(const COSDOptionButton& option)
-{
-  *this = option;
-}
-
-const OSD::COSDOptionButton& COSDOptionButton::operator = (const COSDOptionButton& option)
-{
-  if (this == &option) return * this;
-  m_iHeading = option.m_iHeading;
-  m_iAction = option.m_iAction;
-  m_strValue = option.m_strValue;
-  return *this;
-}
-
-COSDOptionButton::~COSDOptionButton(void)
-{}
-
-IOSDOption* COSDOptionButton::Clone() const
-{
-  return new COSDOptionButton(*this);
-}
-
-
-void COSDOptionButton::Draw(int x, int y, bool bFocus, bool bSelected)
-{
-  DWORD dwColor = 0xff999999;
-  if (bFocus)
-    dwColor = 0xffffffff;
-  CGUIFont* pFont13 = g_fontManager.GetFont("font13");
-  if (pFont13)
-  {
-    wstring strHeading = g_localizeStrings.Get(m_iHeading);
-    WCHAR wsText[256];
-    if (m_strValue.size())
-    {
-      swprintf(wsText, L"%s %S", strHeading.c_str(), m_strValue.c_str());
-    }
-    else
-    {
-      swprintf(wsText, L"%s", strHeading.c_str());
-    }
-    pFont13->DrawShadowText( (float)x, (float)y, dwColor,
-                             wsText, 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-  }
-}
-
-bool COSDOptionButton::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (action.wID == ACTION_OSD_SHOW_SELECT)
-  {
-    executor.OnExecute(m_iAction, this);
-    return true;
-  }
-  return false;
-}
-
-void COSDOptionButton::SetLabel(const CStdString& strValue)
-{
-  m_strValue = strValue;
-}
diff --git a/xbmc/osd/OSDOptionButton.h b/xbmc/osd/OSDOptionButton.h
deleted file mode 100644
index 173d5e4b70..0000000000
--- a/xbmc/osd/OSDOptionButton.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "IOSDOption.h"
-#include "IExecutor.h"
-
-namespace OSD
-{
-class COSDOptionButton :
-      public IOSDOption
-{
-public:
-  COSDOptionButton(int iAction, int iHeading);
-  COSDOptionButton(const COSDOptionButton& option);
-  const OSD::COSDOptionButton& operator = (const COSDOptionButton& option);
-
-  virtual ~COSDOptionButton(void);
-  virtual IOSDOption* Clone() const;
-  virtual void Draw(int x, int y, bool bFocus = false, bool bSelected = false);
-  virtual bool OnAction(IExecutor& executor, const CAction& action);
-  virtual int GetMessage() const { return m_iAction;};
-  virtual void SetLabel(const CStdString& strValue);
-  virtual void SetValue(int iValue){};
-private:
-  int m_iAction;
-  CStdString m_strValue;
-};
-};
diff --git a/xbmc/osd/OSDOptionFloatRange.cpp b/xbmc/osd/OSDOptionFloatRange.cpp
deleted file mode 100644
index b8865ac61d..0000000000
--- a/xbmc/osd/OSDOptionFloatRange.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "OSDOptionFloatRange.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-COSDOptionFloatRange::COSDOptionFloatRange(int iAction, int iHeading)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  m_fMin = 0.0f;
-  m_fMax = 1.0f;
-  m_fValue = 0.0f;
-  m_fInterval = 0.1f;
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-}
-
-COSDOptionFloatRange::COSDOptionFloatRange(int iAction, int iHeading, float fStart, float fEnd, float fInterval, float fValue)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  m_fMin = fStart;
-  m_fMax = fEnd;
-  m_fValue = fValue;
-  m_fInterval = fInterval;
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-}
-
-COSDOptionFloatRange::COSDOptionFloatRange(const COSDOptionFloatRange& option)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  *this = option;
-}
-
-const OSD::COSDOptionFloatRange& COSDOptionFloatRange::operator = (const COSDOptionFloatRange& option)
-{
-  if (this == &option) return * this;
-
-  m_fMin = option.m_fMin;
-  m_fMax = option.m_fMax;
-  m_fValue = option.m_fValue;
-  m_fInterval = option.m_fInterval;
-  m_iHeading = option.m_iHeading;
-  m_iAction = option.m_iAction;
-  return *this;
-}
-
-COSDOptionFloatRange::~COSDOptionFloatRange(void)
-{}
-
-IOSDOption* COSDOptionFloatRange::Clone() const
-{
-  return new COSDOptionFloatRange(*this);
-}
-
-
-void COSDOptionFloatRange::Draw(int x, int y, bool bFocus, bool bSelected)
-{
-  DWORD dwColor = 0xff999999;
-  if (bFocus)
-    dwColor = 0xffffffff;
-  CGUIFont* pFont13 = g_fontManager.GetFont("font13");
-  if (pFont13)
-  {
-    wstring strHeading = g_localizeStrings.Get(m_iHeading);
-    pFont13->DrawShadowText( (float)x, (float)y, dwColor,
-                             strHeading.c_str(), 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-    WCHAR strValue[128];
-    swprintf(strValue, L"%2.2f", m_fValue);
-    pFont13->DrawShadowText( (float)x + 150, (float)y, dwColor,
-                             strValue, 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-  }
-  float fRange = (float)(m_fMax - m_fMin);
-  float fPos = (float)(m_fValue - m_fMin);
-  float fPercent = (fPos / fRange) * 100.0f;
-  m_slider.SetPercentage( (int) fPercent);
-  m_slider.AllocResources();
-  m_slider.SetPosition(x + 200, y);
-  m_slider.Render();
-  m_slider.FreeResources();
-}
-
-bool COSDOptionFloatRange::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (action.wID == ACTION_OSD_SHOW_VALUE_PLUS)
-  {
-    if (m_fValue + m_fInterval <= m_fMax)
-    {
-      m_fValue += m_fInterval ;
-    }
-    else
-    {
-      m_fValue = m_fMin;
-    }
-    executor.OnExecute(m_iAction, this);
-    return true;
-  }
-  if (action.wID == ACTION_OSD_SHOW_VALUE_MIN)
-  {
-    if (m_fValue - m_fInterval >= m_fMin)
-    {
-      m_fValue -= m_fInterval ;
-    }
-    else
-    {
-      m_fValue = m_fMax;
-    }
-    executor.OnExecute(m_iAction, this);
-    return true;
-  }
-  return false;
-}
-
-float COSDOptionFloatRange::GetValue() const
-{
-  return m_fValue;
-}
diff --git a/xbmc/osd/OSDOptionFloatRange.h b/xbmc/osd/OSDOptionFloatRange.h
deleted file mode 100644
index 773283243e..0000000000
--- a/xbmc/osd/OSDOptionFloatRange.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "IOSDOption.h"
-#include "IExecutor.h"
-#include "GUISliderControl.h"
-namespace OSD
-{
-class COSDOptionFloatRange :
-      public IOSDOption
-{
-public:
-  COSDOptionFloatRange(int iAction, int iHeading);
-  COSDOptionFloatRange(int iAction, int iHeading, float fStart, float fEnd, float fInterval, float fValue);
-  COSDOptionFloatRange(const COSDOptionFloatRange& option);
-  const OSD::COSDOptionFloatRange& operator = (const COSDOptionFloatRange& option);
-
-
-  virtual ~COSDOptionFloatRange(void);
-  virtual IOSDOption* Clone() const;
-  virtual void Draw(int x, int y, bool bFocus = false, bool bSelected = false);
-  virtual bool OnAction(IExecutor& executor, const CAction& action);
-  float GetValue() const;
-
-  virtual int GetMessage() const { return m_iAction;};
-  virtual void SetValue(int iValue){};
-  virtual void SetLabel(const CStdString& strLabel){};
-private:
-  CGUISliderControl m_slider;
-  int m_iAction;
-  float m_fMin;
-  float m_fMax;
-  float m_fInterval;
-  float m_fValue;
-};
-};
diff --git a/xbmc/osd/OSDOptionIntRange.cpp b/xbmc/osd/OSDOptionIntRange.cpp
deleted file mode 100644
index 9220d8ab6c..0000000000
--- a/xbmc/osd/OSDOptionIntRange.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "OSDOptionIntRange.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-COSDOptionIntRange::COSDOptionIntRange(int iAction, int iHeading, bool bPercent)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  m_iMin = 0;
-  m_iMax = 10;
-  m_iValue = 0;
-  m_iInterval = 1;
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-  m_bPercent = bPercent;
-}
-
-COSDOptionIntRange::COSDOptionIntRange(int iAction, int iHeading, bool bPercent, int iStart, int iEnd, int iInterval, int iValue)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  m_iMin = iStart;
-  m_iMax = iEnd;
-  m_iValue = iValue;
-  m_iInterval = iInterval;
-  m_iHeading = iHeading;
-  m_iAction = iAction;
-  m_bPercent = bPercent;
-}
-
-COSDOptionIntRange::COSDOptionIntRange(const COSDOptionIntRange& option)
-    : m_slider(0, 1, 0, 0, 0, 0, "osd-pnl-bar.bmp", "xb-ctl-nibv.bmp", "xb-ctl-nibv.bmp", 0)
-{
-  *this = option;
-}
-
-const OSD::COSDOptionIntRange& COSDOptionIntRange::operator = (const COSDOptionIntRange& option)
-{
-  if (this == &option) return * this;
-
-  m_iMin = option.m_iMin;
-  m_iMax = option.m_iMax;
-  m_iValue = option.m_iValue;
-  m_iInterval = option.m_iInterval;
-  m_iHeading = option.m_iHeading;
-  m_iAction = option.m_iAction;
-  m_bPercent = option.m_bPercent;
-  return *this;
-}
-
-COSDOptionIntRange::~COSDOptionIntRange(void)
-{}
-
-IOSDOption* COSDOptionIntRange::Clone() const
-{
-  return new COSDOptionIntRange(*this);
-}
-
-
-void COSDOptionIntRange::Draw(int x, int y, bool bFocus, bool bSelected)
-{
-  DWORD dwColor = 0xff999999;
-  if (bFocus)
-    dwColor = 0xffffffff;
-  CGUIFont* pFont13 = g_fontManager.GetFont("font13");
-  if (pFont13)
-  {
-    wstring strHeading = g_localizeStrings.Get(m_iHeading);
-    pFont13->DrawShadowText( (float)x, (float)y, dwColor,
-                             strHeading.c_str(), 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-    WCHAR strValue[128];
-    if (m_bPercent)
-    {
-      swprintf(strValue, L"%i%%", m_iValue);
-    }
-    else
-    {
-      if (m_iInterval == 1)
-        swprintf(strValue, L"%i/%i", m_iValue, m_iMax);
-      else
-        swprintf(strValue, L"%i/%i", m_iValue, (m_iMax - m_iMin) / m_iInterval);
-    }
-    pFont13->DrawShadowText( (float)x + 150, (float)y, dwColor,
-                             strValue, 0,
-                             0,
-                             2,
-                             2,
-                             0xFF020202);
-  }
-
-  float fRange = (float)(m_iMax - m_iMin);
-  float fPos = (float)(m_iValue - m_iMin);
-  float fPercent = (fPos / fRange) * 100.0f;
-  m_slider.SetPercentage( (int) fPercent);
-  m_slider.AllocResources();
-  m_slider.SetPosition(x + 200, y);
-  m_slider.Render();
-  m_slider.FreeResources();
-}
-
-bool COSDOptionIntRange::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (action.wID == ACTION_OSD_SHOW_VALUE_PLUS)
-  {
-    if (m_iValue + m_iInterval <= m_iMax)
-    {
-      m_iValue += m_iInterval ;
-      executor.OnExecute(m_iAction, this);
-    }
-    else
-    {
-      m_iValue = m_iMin;
-      executor.OnExecute(m_iAction, this);
-    }
-    return true;
-  }
-  if (action.wID == ACTION_OSD_SHOW_VALUE_MIN)
-  {
-    if (m_iValue - m_iInterval >= m_iMin)
-    {
-      m_iValue -= m_iInterval ;
-      executor.OnExecute(m_iAction, this);
-    }
-    else
-    {
-      m_iValue = m_iMax;
-      executor.OnExecute(m_iAction, this);
-    }
-    return true;
-  }
-  return false;
-}
-
-int COSDOptionIntRange::GetValue() const
-{
-  return m_iValue;
-}
diff --git a/xbmc/osd/OSDOptionIntRange.h b/xbmc/osd/OSDOptionIntRange.h
deleted file mode 100644
index eedc11a75e..0000000000
--- a/xbmc/osd/OSDOptionIntRange.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "IOSDOption.h"
-#include "IExecutor.h"
-#include "GUISliderControl.h"
-namespace OSD
-{
-class COSDOptionIntRange :
-      public IOSDOption
-{
-public:
-  COSDOptionIntRange(int iAction, int iHeading, bool bPercent);
-  COSDOptionIntRange(int iAction, int iHeading, bool bPercent, int iStart, int iEnd, int iInterval, int iValue);
-  COSDOptionIntRange(const COSDOptionIntRange& option);
-  const OSD::COSDOptionIntRange& operator = (const COSDOptionIntRange& option);
-
-
-  virtual ~COSDOptionIntRange(void);
-  virtual IOSDOption* Clone() const;
-  virtual void Draw(int x, int y, bool bFocus = false, bool bSelected = false);
-  virtual bool OnAction(IExecutor& executor, const CAction& action);
-
-  int GetValue() const;
-  virtual int GetMessage() const { return m_iAction;};
-  virtual void SetValue(int iValue){m_iValue = iValue;};
-  virtual void SetLabel(const CStdString& strLabel){};
-private:
-  CGUISliderControl m_slider;
-  bool m_bPercent;
-  int m_iAction;
-  int m_iMin;
-  int m_iMax;
-  int m_iInterval;
-  int m_iValue;
-};
-};
diff --git a/xbmc/osd/OSDSubMenu.cpp b/xbmc/osd/OSDSubMenu.cpp
deleted file mode 100644
index f5841b06b3..0000000000
--- a/xbmc/osd/OSDSubMenu.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 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 "stdafx.h"
-#include "OSDSubMenu.h"
-#include "GUIFontManager.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-using namespace OSD;
-
-COSDSubMenu::COSDSubMenu()
-{
-  m_iHeading = 0;
-  m_iCurrentOption = 0;
-  m_iXPos = 0;
-  m_iYPos = 0;
-}
-
-COSDSubMenu::COSDSubMenu(int iHeading, int iXpos, int iYpos)
-{
-  m_iHeading = iHeading;
-  m_iCurrentOption = 0;
-  m_iXPos = iXpos;
-  m_iYPos = iYpos;
-}
-
-COSDSubMenu::COSDSubMenu(const COSDSubMenu& submenu)
-{
-  *this = submenu;
-}
-COSDSubMenu::~COSDSubMenu(void)
-{
-  Clear();
-}
-
-void COSDSubMenu::Clear()
-{
-  ivecOptions i = m_vecOptions.begin();
-  while (i != m_vecOptions.end())
-  {
-    IOSDOption* pOption = *i;
-    delete pOption;
-    i = m_vecOptions.erase(i);
-  }
-  m_iCurrentOption = 0;
-}
-
-
-const COSDSubMenu& COSDSubMenu::operator = (const COSDSubMenu& submenu)
-{
-  if (&submenu == this) return * this;
-  Clear();
-  icvecOptions i = submenu.m_vecOptions.begin();
-  while (i != submenu.m_vecOptions.end())
-  {
-    const IOSDOption* pOption = *i;
-    m_vecOptions.push_back ( pOption->Clone() );
-    ++i;
-  }
-
-  m_iCurrentOption = submenu.m_iCurrentOption;
-  m_iXPos = submenu.m_iXPos;
-  m_iYPos = submenu.m_iYPos;
-  m_iHeading = submenu.m_iHeading;
-  return *this;
-}
-
-COSDSubMenu* COSDSubMenu::Clone() const
-{
-  return new COSDSubMenu(*this);
-}
-
-void COSDSubMenu::Draw()
-{
-  CGUIFont* pFont14 = g_fontManager.GetFont("font14");
-  if (pFont14)
-  {
-    wstring strHeading = g_localizeStrings.Get(m_iHeading);
-    pFont14->DrawShadowText( (float)m_iXPos, (float)m_iYPos, 0xFFFFFFFF,
-                             strHeading.c_str(), 0,
-                             0,
-                             5,
-                             5,
-                             0xFF020202);
-    for (int i = 0; i < (int)m_vecOptions.size(); ++i)
-    {
-      IOSDOption* pOption = m_vecOptions[i];
-      pOption->Draw(m_iXPos + 40, 40 + m_iYPos + i*34, i == m_iCurrentOption, true);
-    }
-  }
-}
-
-bool COSDSubMenu::OnAction(IExecutor& executor, const CAction& action)
-{
-  if (m_iCurrentOption < 0 || m_iCurrentOption >= (int)m_vecOptions.size())
-  {
-    m_iCurrentOption = 0;
-    return false; // invalid choice.
-  }
-  IOSDOption* pOption = m_vecOptions[m_iCurrentOption];
-
-  if (pOption->OnAction(executor, action)) return true;
-
-  if (action.wID == ACTION_OSD_SHOW_UP)
-  {
-
-    if ( m_iCurrentOption > 0)
-    {
-      m_iCurrentOption--;
-    }
-    else
-    {
-      m_iCurrentOption = m_vecOptions.size() - 1;
-    }
-    return true;
-  }
-
-  if (action.wID == ACTION_OSD_SHOW_DOWN)
-  {
-
-    if ( m_iCurrentOption + 1 < (int)m_vecOptions.size() )
-    {
-      m_iCurrentOption++;
-    }
-    else
-    {
-      m_iCurrentOption = 0;
-    }
-    return true;
-  }
-
-  return false;
-}
-
-int COSDSubMenu::GetX() const
-{
-  return m_iXPos;
-}
-
-void COSDSubMenu::SetX(int X)
-{
-  m_iXPos = X;
-}
-
-int COSDSubMenu::GetY() const
-{
-  return m_iYPos;
-}
-
-void COSDSubMenu::SetY(int Y)
-{
-  m_iYPos = Y;
-}
-
-
-void COSDSubMenu::AddOption(const IOSDOption* option)
-{
-  m_vecOptions.push_back(option->Clone());
-}
-
-
-void COSDSubMenu::SetLabel(int iMessage, const CStdString& strLabel)
-{
-  for (int i = 0; i < (int)m_vecOptions.size(); ++i)
-  {
-    IOSDOption* pOption = m_vecOptions[i];
-    if (pOption->GetMessage() == iMessage)
-    {
-      pOption->SetLabel(strLabel);
-    }
-  }
-}
-void COSDSubMenu::SetValue(int iMessage, int iValue)
-{
-  for (int i = 0; i < (int)m_vecOptions.size(); ++i)
-  {
-    IOSDOption* pOption = m_vecOptions[i];
-    if (pOption->GetMessage() == iMessage)
-    {
-      pOption->SetValue(iValue);
-    }
-  }
-}
diff --git a/xbmc/osd/OSDSubMenu.h b/xbmc/osd/OSDSubMenu.h
deleted file mode 100644
index b399b169d9..0000000000
--- a/xbmc/osd/OSDSubMenu.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "IOSDOption.h"
-
-namespace OSD
-{
-class COSDSubMenu
-{
-public:
-  COSDSubMenu();
-  COSDSubMenu(int iHeading, int iXpos, int iYpos);
-  COSDSubMenu(const COSDSubMenu& submenu);
-  const COSDSubMenu& operator = (const COSDSubMenu& submenu);
-
-  virtual ~COSDSubMenu(void);
-  COSDSubMenu* Clone() const;
-
-  void Draw();
-  void AddOption(const IOSDOption* option);
-  bool OnAction(IExecutor& executor, const CAction& action);
-
-  int GetX() const;
-  void SetX(int X);
-
-  int GetY() const;
-  void SetY(int X) ;
-  void SetValue(int iMessage, int iValue);
-  void SetLabel(int iMessage, const CStdString& strLabel);
-private:
-  void Clear();
-  typedef vector<IOSDOption*>::iterator ivecOptions;
-  typedef vector<IOSDOption*>::const_iterator icvecOptions;
-  vector<IOSDOption*> m_vecOptions;
-
-  int m_iCurrentOption;
-  int m_iXPos;
-  int m_iYPos;
-  int m_iHeading;
-};
-};
diff --git a/xbmc/osd/osdmenu.h b/xbmc/osd/osdmenu.h
deleted file mode 100644
index 6231fcd692..0000000000
--- a/xbmc/osd/osdmenu.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 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 "OSDSubMenu.h"
-
-namespace OSD
-{
-class COSDMenu
-{
-public:
-  COSDMenu();
-  COSDMenu(int iXpos, int iYpos);
-  COSDMenu(const COSDMenu& menu);
-  const COSDMenu& operator = (const COSDMenu& menu);
-
-  virtual ~COSDMenu(void);
-  COSDMenu* Clone();
-
-  void AddSubMenu(const COSDSubMenu& submenu);
-  void Draw();
-  bool OnAction(IExecutor& executor, const CAction& action);
-
-  int GetX() const;
-  void SetX(int X);
-
-  int GetY() const;
-  void SetY(int Y) ;
-
-  int GetSelectedMenu() const;
-  void Clear();
-  void SetValue(int iMessage, int iValue);
-  void SetLabel(int iMessage, const CStdString& strLabel);
-private:
-  typedef vector<COSDSubMenu*>::iterator ivecSubMenus;
-  typedef vector<COSDSubMenu*>::const_iterator icvecSubMenus;
-  vector<COSDSubMenu*> m_vecSubMenus;
-
-  int m_iCurrentSubMenu;
-  int m_iXPos;
-  int m_iYPos;
-};
-};