Merge remote branch 'upstream/master'

Fixed conflicts:
	addons/skin.confluence/720p/DialogFullScreenInfo.xml
	addons/skin.confluence/720p/Home.xml
	addons/skin.confluence/720p/PlayerControls.xml
	addons/skin.confluence/720p/Settings.xml
	addons/skin.confluence/720p/SettingsSystemInfo.xml
	addons/skin.confluence/720p/VideoFullScreen.xml
	addons/skin.confluence/720p/VideoOSD.xml
	addons/skin.confluence/720p/custom_SkinSetting_1111.xml
	addons/skin.confluence/720p/defaults.xml
	addons/skin.confluence/720p/includes.xml
	addons/skin.confluence/language/English/strings.xml
	language/Dutch/strings.xml
	project/VS2008Express/XBMC for Windows.sln
	project/VS2008Express/XBMC.vcproj
	project/VS2008Express/guilib.vcproj
	xbmc/addons/AddonDll.h

8 files changed, 1148 insertions, 1126 deletions

diff --git a/guilib/GUIFontTTF.cpp b/guilib/GUIFontTTF.cpp
index 7befa8609f..50e5eb213b 100644
--- a/guilib/GUIFontTTF.cpp
+++ b/guilib/GUIFontTTF.cpp
@@ -698,7 +698,14 @@ void CGUIFontTTFBase::RenderCharacter(float posX, float posY, const Character *c
   if(m_vertex_count >= m_vertex_size)
   {
     m_vertex_size *= 2;
+    void* old      = m_vertex;
     m_vertex       = (SVertex*)realloc(m_vertex, m_vertex_size * sizeof(SVertex));
+    if (!m_vertex)
+    {
+      free(old);
+      printf("realloc failed in CGUIFontTTF::RenderCharacter. aborting\n");
+      abort();
+    }
   }
 
   m_color = color;
diff --git a/guilib/GUIFontTTFDX.cpp b/guilib/GUIFontTTFDX.cpp
index 3bef0d1935..9d425dc339 100644
--- a/guilib/GUIFontTTFDX.cpp
+++ b/guilib/GUIFontTTFDX.cpp
@@ -1,286 +1,286 @@
-/*

- *      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

- *

- */

-

-#ifdef HAS_DX

-

-#include "GUIFont.h"

-#include "GUIFontTTFDX.h"

-#include "GUIFontManager.h"

-#include "Texture.h"

-#include "gui3d.h"

-#include "WindowingFactory.h"

-#include "utils/log.h"

-

-// stuff for freetype

-#include "ft2build.h"

-

-#include FT_FREETYPE_H

-#include FT_GLYPH_H

-#include FT_OUTLINE_H

-

-using namespace std;

-

-struct CUSTOMVERTEX 

-{

-  FLOAT x, y, z;

-  DWORD color;

-  FLOAT tu, tv;   // Texture coordinates

-};

-

-

-CGUIFontTTFDX::CGUIFontTTFDX(const CStdString& strFileName)

-: CGUIFontTTFBase(strFileName)

-{

-  m_speedupTexture = NULL;

-}

-

-CGUIFontTTFDX::~CGUIFontTTFDX(void)

-{

-  SAFE_DELETE(m_speedupTexture);

-}

-

-void CGUIFontTTFDX::RenderInternal(SVertex* v)

-{

-  CUSTOMVERTEX verts[4] =  {

-  { v[0].x-0.5f, v[0].y-0.5f, v[0].z, m_color, v[0].u, v[0].v},

-  { v[1].x-0.5f, v[1].y-0.5f, v[1].z, m_color, v[1].u, v[1].v},

-  { v[2].x-0.5f, v[2].y-0.5f, v[2].z, m_color, v[2].u, v[2].v},

-  { v[3].x-0.5f, v[3].y-0.5f, v[3].z, m_color, v[3].u, v[3].v}

-  };

-

-  g_Windowing.Get3DDevice()->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(CUSTOMVERTEX));

-}

-

-void CGUIFontTTFDX::Begin()

-{

-  LPDIRECT3DDEVICE9 pD3DDevice = g_Windowing.Get3DDevice();

-

-  if (m_nestedBeginCount == 0)

-  {

-    // just have to blit from our texture.

-    pD3DDevice->SetTexture( 0, m_texture->GetTextureObject() );

-

-    pD3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP );

-    pD3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP );

-    pD3DDevice->SetSamplerState( 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR );

-    pD3DDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR );

-    pD3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); // only use diffuse

-    pD3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);

-    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );

-    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);

-    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);

-

-    // no other texture stages needed

-    pD3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);

-    pD3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

-

-    pD3DDevice->SetRenderState( D3DRS_ZENABLE, FALSE );

-    pD3DDevice->SetRenderState( D3DRS_FOGENABLE, FALSE );

-    pD3DDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID );

-    pD3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_NONE );

-    pD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE );

-    pD3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );

-    pD3DDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );

-    pD3DDevice->SetRenderState( D3DRS_LIGHTING, FALSE);

-

-    pD3DDevice->SetFVF(D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);

-  }

-  // Keep track of the nested begin/end calls.

-  m_vertex_count = 0;

-  m_nestedBeginCount++;

-}

-

-void CGUIFontTTFDX::End()

-{

-  LPDIRECT3DDEVICE9 pD3DDevice = g_Windowing.Get3DDevice();

-

-  if (m_nestedBeginCount == 0)

-    return;

-

-  if (--m_nestedBeginCount > 0)

-    return;

-

-  pD3DDevice->SetTexture(0, NULL);

-  pD3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );

-}

-

-CBaseTexture* CGUIFontTTFDX::ReallocTexture(unsigned int& newHeight)

-{

-  CBaseTexture* pNewTexture = new CDXTexture(m_textureWidth, newHeight, XB_FMT_A8);

-  pNewTexture->CreateTextureObject();

-  LPDIRECT3DTEXTURE9 newTexture = pNewTexture->GetTextureObject();

-

-  if (newTexture == NULL)

-  {

-    CLog::Log(LOGERROR, __FUNCTION__" - failed to create the new texture h=%d w=%d", m_textureWidth, newHeight);

-    SAFE_DELETE(pNewTexture);

-    return NULL;

-  }

-

-  // Use a speedup texture in system memory when main texture in default pool+dynamic

-  // Otherwise the texture would have to be copied from vid mem to sys mem, which is too slow for subs while playing video.

-  CD3DTexture* newSpeedupTexture = NULL;

-  if (g_Windowing.DefaultD3DPool() == D3DPOOL_DEFAULT && g_Windowing.DefaultD3DUsage() == D3DUSAGE_DYNAMIC)

-  {

-    newSpeedupTexture = new CD3DTexture();

-

-    if (!newSpeedupTexture->Create(m_textureWidth, newHeight, 1, 0, D3DFMT_A8, D3DPOOL_SYSTEMMEM))

-    {

-      SAFE_DELETE(newSpeedupTexture);

-      SAFE_DELETE(pNewTexture);

-      return NULL;

-    }

-  }

-

-  LPDIRECT3DSURFACE9 pSource, pTarget;

-  HRESULT hr;

-  // There might be data to copy from the previous texture

-  if ((newSpeedupTexture && m_speedupTexture) || (newTexture && m_texture))

-  {

-    if (m_speedupTexture)

-    {

-      m_speedupTexture->GetSurfaceLevel(0, &pSource);

-      newSpeedupTexture->GetSurfaceLevel(0, &pTarget);

-    }

-    else

-    {

-      m_texture->GetTextureObject()->GetSurfaceLevel(0, &pSource);

-      newTexture->GetSurfaceLevel(0, &pTarget);

-    }

-

-    D3DLOCKED_RECT srclr, dstlr;

-    if(FAILED(pSource->LockRect( &srclr, NULL, 0 ))

-    || FAILED(pTarget->LockRect( &dstlr, NULL, 0 )))

-    {

-      CLog::Log(LOGERROR, __FUNCTION__" - failed to lock surfaces");

-      SAFE_DELETE(newSpeedupTexture);

-      SAFE_DELETE(pNewTexture);

-      pSource->Release();

-      pTarget->Release();

-      return NULL;

-    }

-

-    unsigned char *dst = (unsigned char *)dstlr.pBits;

-    unsigned char *src = (unsigned char *)srclr.pBits;

-    unsigned int dstPitch = dstlr.Pitch;

-    unsigned int srcPitch = srclr.Pitch;

-    unsigned int minPitch = std::min(srcPitch, dstPitch);

-

-    if (srcPitch == dstPitch)

-    {

-      memcpy(dst, src, srcPitch * m_textureHeight);

-    }

-    else

-    {

-      for (unsigned int y = 0; y < m_textureHeight; y++)

-      {

-        memcpy(dst, src, minPitch);

-        src += srcPitch;

-        dst += dstPitch;

-      }

-    }

-    pSource->UnlockRect();

-    pTarget->UnlockRect();

-

-    pSource->Release();

-    pTarget->Release();

-  }

-

-  // Upload from speedup texture to main texture

-  if (newSpeedupTexture && m_speedupTexture)

-  {

-    LPDIRECT3DSURFACE9 pSource, pTarget;

-    newSpeedupTexture->GetSurfaceLevel(0, &pSource);

-    newTexture->GetSurfaceLevel(0, &pTarget);

-    const RECT rect = { 0, 0, m_textureWidth, m_textureHeight };

-    const POINT point = { 0, 0 };

-

-    hr = g_Windowing.Get3DDevice()->UpdateSurface(pSource, &rect, pTarget, &point);

-    SAFE_RELEASE(pSource);

-    SAFE_RELEASE(pTarget);

-

-    if (FAILED(hr))

-    {

-      CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr);

-      SAFE_DELETE(newSpeedupTexture);

-      SAFE_DELETE(pNewTexture);

-      return NULL;

-    }

-  }

-

-  SAFE_DELETE(m_texture);

-  SAFE_DELETE(m_speedupTexture);

-  m_textureHeight = newHeight;

-  m_speedupTexture = newSpeedupTexture;

-

-  return pNewTexture;

-}

-

-bool CGUIFontTTFDX::CopyCharToTexture(FT_BitmapGlyph bitGlyph, Character* ch)

-{

-  FT_Bitmap bitmap = bitGlyph->bitmap;

-

-  LPDIRECT3DSURFACE9 target;

-  if (m_speedupTexture)

-    m_speedupTexture->GetSurfaceLevel(0, &target);

-  else

-    m_texture->GetTextureObject()->GetSurfaceLevel(0, &target);

-

-  RECT sourcerect = { 0, 0, bitmap.width, bitmap.rows };

-  RECT targetrect;

-  targetrect.top = m_posY + ch->offsetY;

-  targetrect.left = m_posX + bitGlyph->left;

-  targetrect.bottom = targetrect.top + bitmap.rows;

-  targetrect.right = targetrect.left + bitmap.width;

-  

-  HRESULT hr = D3DXLoadSurfaceFromMemory( target, NULL, &targetrect,

-                                          bitmap.buffer, D3DFMT_LIN_A8, bitmap.pitch, NULL, &sourcerect,

-                                          D3DX_FILTER_NONE, 0x00000000);

-

-  SAFE_RELEASE(target);

-

-  if (FAILED(hr))

-  {

-    CLog::Log(LOGERROR, __FUNCTION__": Failed to copy the new character (0x%08X)", hr);

-    return false;

-  }

-

-  if (m_speedupTexture)

-  {

-    // Upload to GPU - the automatic dirty region tracking takes care of the rect.

-    HRESULT hr = g_Windowing.Get3DDevice()->UpdateTexture(m_speedupTexture->Get(), m_texture->GetTextureObject());

-    if (FAILED(hr))

-    {

-      CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr);

-      return false;

-    }

-  }

-  return TRUE;

-}

-

-

-void CGUIFontTTFDX::DeleteHardwareTexture()

-{

-  

-}

-

-

-#endif

+/*
+ *      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
+ *
+ */
+
+#ifdef HAS_DX
+
+#include "GUIFont.h"
+#include "GUIFontTTFDX.h"
+#include "GUIFontManager.h"
+#include "Texture.h"
+#include "gui3d.h"
+#include "WindowingFactory.h"
+#include "utils/log.h"
+
+// stuff for freetype
+#include "ft2build.h"
+
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+
+using namespace std;
+
+struct CUSTOMVERTEX 
+{
+  FLOAT x, y, z;
+  DWORD color;
+  FLOAT tu, tv;   // Texture coordinates
+};
+
+
+CGUIFontTTFDX::CGUIFontTTFDX(const CStdString& strFileName)
+: CGUIFontTTFBase(strFileName)
+{
+  m_speedupTexture = NULL;
+}
+
+CGUIFontTTFDX::~CGUIFontTTFDX(void)
+{
+  SAFE_DELETE(m_speedupTexture);
+}
+
+void CGUIFontTTFDX::RenderInternal(SVertex* v)
+{
+  CUSTOMVERTEX verts[4] =  {
+  { v[0].x-0.5f, v[0].y-0.5f, v[0].z, m_color, v[0].u, v[0].v},
+  { v[1].x-0.5f, v[1].y-0.5f, v[1].z, m_color, v[1].u, v[1].v},
+  { v[2].x-0.5f, v[2].y-0.5f, v[2].z, m_color, v[2].u, v[2].v},
+  { v[3].x-0.5f, v[3].y-0.5f, v[3].z, m_color, v[3].u, v[3].v}
+  };
+
+  g_Windowing.Get3DDevice()->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(CUSTOMVERTEX));
+}
+
+void CGUIFontTTFDX::Begin()
+{
+  LPDIRECT3DDEVICE9 pD3DDevice = g_Windowing.Get3DDevice();
+
+  if (m_nestedBeginCount == 0)
+  {
+    // just have to blit from our texture.
+    pD3DDevice->SetTexture( 0, m_texture->GetTextureObject() );
+
+    pD3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP );
+    pD3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP );
+    pD3DDevice->SetSamplerState( 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR );
+    pD3DDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR );
+    pD3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); // only use diffuse
+    pD3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
+    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
+    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+    pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+    // no other texture stages needed
+    pD3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    pD3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+
+    pD3DDevice->SetRenderState( D3DRS_ZENABLE, FALSE );
+    pD3DDevice->SetRenderState( D3DRS_FOGENABLE, FALSE );
+    pD3DDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID );
+    pD3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_NONE );
+    pD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE );
+    pD3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
+    pD3DDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
+    pD3DDevice->SetRenderState( D3DRS_LIGHTING, FALSE);
+
+    pD3DDevice->SetFVF(D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+  }
+  // Keep track of the nested begin/end calls.
+  m_vertex_count = 0;
+  m_nestedBeginCount++;
+}
+
+void CGUIFontTTFDX::End()
+{
+  LPDIRECT3DDEVICE9 pD3DDevice = g_Windowing.Get3DDevice();
+
+  if (m_nestedBeginCount == 0)
+    return;
+
+  if (--m_nestedBeginCount > 0)
+    return;
+
+  pD3DDevice->SetTexture(0, NULL);
+  pD3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
+}
+
+CBaseTexture* CGUIFontTTFDX::ReallocTexture(unsigned int& newHeight)
+{
+  CBaseTexture* pNewTexture = new CDXTexture(m_textureWidth, newHeight, XB_FMT_A8);
+  pNewTexture->CreateTextureObject();
+  LPDIRECT3DTEXTURE9 newTexture = pNewTexture->GetTextureObject();
+
+  if (newTexture == NULL)
+  {
+    CLog::Log(LOGERROR, __FUNCTION__" - failed to create the new texture h=%d w=%d", m_textureWidth, newHeight);
+    SAFE_DELETE(pNewTexture);
+    return NULL;
+  }
+
+  // Use a speedup texture in system memory when main texture in default pool+dynamic
+  // Otherwise the texture would have to be copied from vid mem to sys mem, which is too slow for subs while playing video.
+  CD3DTexture* newSpeedupTexture = NULL;
+  if (g_Windowing.DefaultD3DPool() == D3DPOOL_DEFAULT && g_Windowing.DefaultD3DUsage() == D3DUSAGE_DYNAMIC)
+  {
+    newSpeedupTexture = new CD3DTexture();
+
+    if (!newSpeedupTexture->Create(m_textureWidth, newHeight, 1, 0, D3DFMT_A8, D3DPOOL_SYSTEMMEM))
+    {
+      SAFE_DELETE(newSpeedupTexture);
+      SAFE_DELETE(pNewTexture);
+      return NULL;
+    }
+  }
+
+  LPDIRECT3DSURFACE9 pSource, pTarget;
+  HRESULT hr;
+  // There might be data to copy from the previous texture
+  if ((newSpeedupTexture && m_speedupTexture) || (newTexture && m_texture))
+  {
+    if (m_speedupTexture)
+    {
+      m_speedupTexture->GetSurfaceLevel(0, &pSource);
+      newSpeedupTexture->GetSurfaceLevel(0, &pTarget);
+    }
+    else
+    {
+      m_texture->GetTextureObject()->GetSurfaceLevel(0, &pSource);
+      newTexture->GetSurfaceLevel(0, &pTarget);
+    }
+
+    D3DLOCKED_RECT srclr, dstlr;
+    if(FAILED(pSource->LockRect( &srclr, NULL, 0 ))
+    || FAILED(pTarget->LockRect( &dstlr, NULL, 0 )))
+    {
+      CLog::Log(LOGERROR, __FUNCTION__" - failed to lock surfaces");
+      SAFE_DELETE(newSpeedupTexture);
+      SAFE_DELETE(pNewTexture);
+      pSource->Release();
+      pTarget->Release();
+      return NULL;
+    }
+
+    unsigned char *dst = (unsigned char *)dstlr.pBits;
+    unsigned char *src = (unsigned char *)srclr.pBits;
+    unsigned int dstPitch = dstlr.Pitch;
+    unsigned int srcPitch = srclr.Pitch;
+    unsigned int minPitch = std::min(srcPitch, dstPitch);
+
+    if (srcPitch == dstPitch)
+    {
+      memcpy(dst, src, srcPitch * m_textureHeight);
+    }
+    else
+    {
+      for (unsigned int y = 0; y < m_textureHeight; y++)
+      {
+        memcpy(dst, src, minPitch);
+        src += srcPitch;
+        dst += dstPitch;
+      }
+    }
+    pSource->UnlockRect();
+    pTarget->UnlockRect();
+
+    pSource->Release();
+    pTarget->Release();
+  }
+
+  // Upload from speedup texture to main texture
+  if (newSpeedupTexture && m_speedupTexture)
+  {
+    LPDIRECT3DSURFACE9 pSource, pTarget;
+    newSpeedupTexture->GetSurfaceLevel(0, &pSource);
+    newTexture->GetSurfaceLevel(0, &pTarget);
+    const RECT rect = { 0, 0, m_textureWidth, m_textureHeight };
+    const POINT point = { 0, 0 };
+
+    hr = g_Windowing.Get3DDevice()->UpdateSurface(pSource, &rect, pTarget, &point);
+    SAFE_RELEASE(pSource);
+    SAFE_RELEASE(pTarget);
+
+    if (FAILED(hr))
+    {
+      CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr);
+      SAFE_DELETE(newSpeedupTexture);
+      SAFE_DELETE(pNewTexture);
+      return NULL;
+    }
+  }
+
+  SAFE_DELETE(m_texture);
+  SAFE_DELETE(m_speedupTexture);
+  m_textureHeight = newHeight;
+  m_speedupTexture = newSpeedupTexture;
+
+  return pNewTexture;
+}
+
+bool CGUIFontTTFDX::CopyCharToTexture(FT_BitmapGlyph bitGlyph, Character* ch)
+{
+  FT_Bitmap bitmap = bitGlyph->bitmap;
+
+  LPDIRECT3DSURFACE9 target;
+  if (m_speedupTexture)
+    m_speedupTexture->GetSurfaceLevel(0, &target);
+  else
+    m_texture->GetTextureObject()->GetSurfaceLevel(0, &target);
+
+  RECT sourcerect = { 0, 0, bitmap.width, bitmap.rows };
+  RECT targetrect;
+  targetrect.top = m_posY + ch->offsetY;
+  targetrect.left = m_posX + bitGlyph->left;
+  targetrect.bottom = targetrect.top + bitmap.rows;
+  targetrect.right = targetrect.left + bitmap.width;
+  
+  HRESULT hr = D3DXLoadSurfaceFromMemory( target, NULL, &targetrect,
+                                          bitmap.buffer, D3DFMT_LIN_A8, bitmap.pitch, NULL, &sourcerect,
+                                          D3DX_FILTER_NONE, 0x00000000);
+
+  SAFE_RELEASE(target);
+
+  if (FAILED(hr))
+  {
+    CLog::Log(LOGERROR, __FUNCTION__": Failed to copy the new character (0x%08X)", hr);
+    return false;
+  }
+
+  if (m_speedupTexture)
+  {
+    // Upload to GPU - the automatic dirty region tracking takes care of the rect.
+    HRESULT hr = g_Windowing.Get3DDevice()->UpdateTexture(m_speedupTexture->Get(), m_texture->GetTextureObject());
+    if (FAILED(hr))
+    {
+      CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr);
+      return false;
+    }
+  }
+  return TRUE;
+}
+
+
+void CGUIFontTTFDX::DeleteHardwareTexture()
+{
+  
+}
+
+
+#endif
diff --git a/guilib/GUIFontTTFDX.h b/guilib/GUIFontTTFDX.h
index d1b210df7a..72e20a9dae 100644
--- a/guilib/GUIFontTTFDX.h
+++ b/guilib/GUIFontTTFDX.h
@@ -1,57 +1,57 @@
-/*

-*      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

-*

-*/

-

-/*!

-\file GUIFont.h

-\brief

-*/

-

-#ifndef CGUILIB_GUIFONTTTF_DX_H

-#define CGUILIB_GUIFONTTTF_DX_H

-#pragma once

-

-

-#include "GUIFontTTF.h"

-#include "D3DResource.h"

-

-/*!

- \ingroup textures

- \brief

- */

-class CGUIFontTTFDX : public CGUIFontTTFBase

-{

-public:

-  CGUIFontTTFDX(const CStdString& strFileName);

-  virtual ~CGUIFontTTFDX(void);

-

-  virtual void Begin();

-  virtual void End();

-

-protected:

-  virtual CBaseTexture* ReallocTexture(unsigned int& newHeight);

-  virtual bool CopyCharToTexture(FT_BitmapGlyph bitGlyph, Character *ch);

-  virtual void DeleteHardwareTexture();

-  virtual void RenderInternal(SVertex* v);

-  CD3DTexture *m_speedupTexture;  // extra texture to speed up reallocations when the main texture is in d3dpool_default.

-                                  // that's the typical situation of Windows Vista and above.

-};

-

-#endif

+/*
+*      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
+*
+*/
+
+/*!
+\file GUIFont.h
+\brief
+*/
+
+#ifndef CGUILIB_GUIFONTTTF_DX_H
+#define CGUILIB_GUIFONTTTF_DX_H
+#pragma once
+
+
+#include "GUIFontTTF.h"
+#include "D3DResource.h"
+
+/*!
+ \ingroup textures
+ \brief
+ */
+class CGUIFontTTFDX : public CGUIFontTTFBase
+{
+public:
+  CGUIFontTTFDX(const CStdString& strFileName);
+  virtual ~CGUIFontTTFDX(void);
+
+  virtual void Begin();
+  virtual void End();
+
+protected:
+  virtual CBaseTexture* ReallocTexture(unsigned int& newHeight);
+  virtual bool CopyCharToTexture(FT_BitmapGlyph bitGlyph, Character *ch);
+  virtual void DeleteHardwareTexture();
+  virtual void RenderInternal(SVertex* v);
+  CD3DTexture *m_speedupTexture;  // extra texture to speed up reallocations when the main texture is in d3dpool_default.
+                                  // that's the typical situation of Windows Vista and above.
+};
+
+#endif
diff --git a/guilib/GUISliderControl.cpp b/guilib/GUISliderControl.cpp
index 3a89bdfc9a..baf6f48518 100644
--- a/guilib/GUISliderControl.cpp
+++ b/guilib/GUISliderControl.cpp
@@ -34,6 +34,7 @@ CGUISliderControl::CGUISliderControl(int parentID, int controlID, float posX, fl
   m_iPercent = 0;
   m_iStart = 0;
   m_iEnd = 100;
+  m_iInterval = 1;
   m_fStart = 0.0f;
   m_fEnd = 1.0f;
   m_fInterval = 0.1f;
@@ -138,13 +139,13 @@ void CGUISliderControl::Move(int iNumSteps)
     break;
 
   case SPIN_CONTROL_TYPE_INT:
-    m_iValue += iNumSteps;
+    m_iValue += m_iInterval * iNumSteps;
     if (m_iValue < m_iStart) m_iValue = m_iStart;
     if (m_iValue > m_iEnd) m_iValue = m_iEnd;
     break;
 
   default:
-    m_iPercent += iNumSteps;
+    m_iPercent += m_iInterval * iNumSteps;
     if (m_iPercent < 0) m_iPercent = 0;
     if (m_iPercent > 100) m_iPercent = 100;
     break;
@@ -204,9 +205,20 @@ float CGUISliderControl::GetFloatValue() const
     return (float)m_iPercent;
 }
 
+void CGUISliderControl::SetIntInterval(int iInterval)
+{
+  if (m_iType == SPIN_CONTROL_TYPE_FLOAT)
+    m_fInterval = (float)iInterval;
+  else
+    m_iInterval = iInterval;
+}
+
 void CGUISliderControl::SetFloatInterval(float fInterval)
 {
-  m_fInterval = fInterval;
+  if (m_iType == SPIN_CONTROL_TYPE_FLOAT)
+    m_fInterval = fInterval;
+  else
+    m_iInterval = (int)fInterval;
 }
 
 void CGUISliderControl::SetRange(int iStart, int iEnd)
diff --git a/guilib/GUISliderControl.h b/guilib/GUISliderControl.h
index e90cf5ece4..73ba9d51a1 100644
--- a/guilib/GUISliderControl.h
+++ b/guilib/GUISliderControl.h
@@ -64,6 +64,7 @@ public:
   int GetIntValue() const;
   void SetFloatValue(float fValue);
   float GetFloatValue() const;
+  void SetIntInterval(int iInterval);
   void SetFloatInterval(float fInterval);
   void SetType(int iType) { m_iType = iType; };
   virtual CStdString GetDescription() const;
@@ -88,6 +89,7 @@ protected:
 
   int m_iValue;
   int m_iStart;
+  int m_iInterval;
   int m_iEnd;
 
   float m_fValue;
diff --git a/guilib/GUITextureD3D.cpp b/guilib/GUITextureD3D.cpp
index cab23b660f..c052591032 100644
--- a/guilib/GUITextureD3D.cpp
+++ b/guilib/GUITextureD3D.cpp
@@ -63,13 +63,13 @@ void CGUITextureD3D::Begin(color_t color)
     p3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
     p3DDevice->SetSamplerState( 1, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP );
     p3DDevice->SetSamplerState( 1, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP );
-    p3DDevice->SetTextureStageState( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);

-    p3DDevice->SetTextureStageState( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

+    p3DDevice->SetTextureStageState( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    p3DDevice->SetTextureStageState( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
   }
   else
   {
-    p3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);

-    p3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

+    p3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    p3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
   }
   p3DDevice->SetRenderState( D3DRS_ALPHATESTENABLE, TRUE );
   p3DDevice->SetRenderState( D3DRS_ALPHAREF, 0 );
@@ -198,8 +198,8 @@ void CGUITextureD3D::DrawQuad(const CRect &rect, color_t color, CBaseTexture *te
     p3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
     p3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP );
     p3DDevice->SetSamplerState( 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP );
-    p3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);

-    p3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

+    p3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+    p3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
   }
 
   p3DDevice->SetRenderState( D3DRS_ALPHATESTENABLE, TRUE );
diff --git a/guilib/common/IRServerSuite/IRServerSuite.cpp b/guilib/common/IRServerSuite/IRServerSuite.cpp
index b8faa09b08..3eff632fcf 100644
--- a/guilib/common/IRServerSuite/IRServerSuite.cpp
+++ b/guilib/common/IRServerSuite/IRServerSuite.cpp
@@ -108,8 +108,8 @@ bool CRemoteControl::Connect()
   char     service[33];
   int      res;
 
-  hints.ai_family   = AF_UNSPEC;

-  hints.ai_socktype = SOCK_STREAM;

+  hints.ai_family   = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = IPPROTO_TCP;
   sprintf(service, "%d", IRSS_PORT);
 
@@ -334,6 +334,7 @@ bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
       if (datalen < 8 + devicenamelength)
       {
         CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        delete[] deviceName;
         return false;
       }
       //next 4 bytes is keycode length
diff --git a/guilib/guilib_win32.vcproj b/guilib/guilib_win32.vcproj
index 794cf9d115..4837e2253d 100644
--- a/guilib/guilib_win32.vcproj
+++ b/guilib/guilib_win32.vcproj
@@ -1,772 +1,772 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="guilib"

-	ProjectGUID="{510441AC-B9E1-4B31-9C0C-EB3AD39D90C4}"

-	RootNamespace="guilib"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug (Win32)"

-			IntermediateDirectory="Debug (Win32)"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/EHa"

-				Optimization="0"

-				AdditionalIncludeDirectories="../xbmc/;freetype2/include;../xbmc/lib/boost"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"

-				StringPooling="FALSE"

-				MinimalRebuild="TRUE"

-				ExceptionHandling="FALSE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="include.h"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/guilib.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release (Win32)"

-			IntermediateDirectory="Release (Win32)"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../xbmc/;freetype2/include;../xbmc/lib/boost"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="include.h"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/guilib.lib"

-				IgnoreDefaultLibraryNames=""/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug (SDL)|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/EHa"

-				Optimization="0"

-				AdditionalIncludeDirectories="../guilib;../xbmc/Win32;../xbmc/;freetype2/include;../xbmc/lib/boost;../xbmc/utils;&quot;../xbmc/lib/libSDL-WIN32/include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"

-				StringPooling="FALSE"

-				MinimalRebuild="TRUE"

-				ExceptionHandling="FALSE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				EnableEnhancedInstructionSet="0"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="include.h"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/guilib.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release (SDL)|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				GlobalOptimizations="TRUE"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="../guilib;../xbmc/win32;../xbmc;freetype2\include;../xbmc/lib/boost;../xbmc/utils;&quot;../xbmc/lib/libSDL-WIN32/include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"

-				MinimalRebuild="FALSE"

-				RuntimeLibrary="0"

-				EnableEnhancedInstructionSet="2"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="include.h"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/guilib.lib"

-				AdditionalLibraryDirectories=""

-				IgnoreAllDefaultLibraries="FALSE"

-				IgnoreDefaultLibraryNames=""/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath=".\AnimatedGif.cpp">

-			</File>

-			<File

-				RelativePath=".\AudioContext.cpp">

-			</File>

-			<File

-				RelativePath=".\DirectXGraphics.cpp">

-			</File>

-			<File

-				RelativePath=".\FrameBufferObject.cpp">

-			</File>

-			<File

-				RelativePath=".\GraphicContext.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIAudioManager.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIBaseContainer.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIBorderedImage.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIButtonControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIButtonScroller.cpp">

-			</File>

-			<File

-				RelativePath=".\GUICheckMarkControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIColorManager.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GuiControlFactory.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIControlGroup.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIControlGroupList.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIDialog.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIEditControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIFadeLabelControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIFixedListContainer.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIFont.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIFontManager.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIFontTTF.cpp">

-			</File>

-			<File

-				RelativePath=".\guiImage.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIIncludes.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIInfoColor.cpp">

-			</File>

-			<File

-				RelativePath=".\GUILabelControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIListContainer.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIListGroup.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIListItem.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIListItemLayout.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIListLabel.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIMessage.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIMoverControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIMultiImage.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIMultiSelectText.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIPanelContainer.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIProgressControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIRadioButtonControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIResizeControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIRSSControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIScrollBarControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISelectButtonControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISettingsSliderControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISliderControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISound.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISpinControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUISpinControlEx.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIStandardWindow.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITextBox.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITextLayout.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITexture.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITextureD3D.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITextureGL.cpp">

-			</File>

-			<File

-				RelativePath=".\GUITextureSDL.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIToggleButtonControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIVideoControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIVisualisationControl.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIWindow.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIWindowManager.cpp">

-			</File>

-			<File

-				RelativePath=".\GUIWrappingListContainer.cpp">

-			</File>

-			<File

-				RelativePath=".\include.cpp">

-			</File>

-			<File

-				RelativePath=".\IWindowManagerCallback.cpp">

-			</File>

-			<File

-				RelativePath=".\Key.cpp">

-			</File>

-			<File

-				RelativePath=".\LocalizeStrings.cpp">

-			</File>

-			<File

-				RelativePath=".\Shader.cpp">

-			</File>

-			<File

-				RelativePath=".\SkinInfo.cpp">

-			</File>

-			<File

-				RelativePath=".\Surface.cpp">

-			</File>

-			<File

-				RelativePath=".\TextureBundle.cpp">

-			</File>

-			<File

-				RelativePath=".\TextureManager.cpp">

-			</File>

-			<File

-				RelativePath=".\VisibleEffect.cpp">

-			</File>

-			<File

-				RelativePath=".\XMLUtils.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath=".\AnimatedGif.h">

-			</File>

-			<File

-				RelativePath=".\AudioContext.h">

-			</File>

-			<File

-				RelativePath=".\DirectXGraphics.h">

-			</File>

-			<File

-				RelativePath=".\FrameBufferObject.h">

-			</File>

-			<File

-				RelativePath=".\Geometry.h">

-			</File>

-			<File

-				RelativePath=".\GraphicContext.h">

-			</File>

-			<File

-				RelativePath=".\gui3d.h">

-			</File>

-			<File

-				RelativePath=".\GUIAudioManager.h">

-			</File>

-			<File

-				RelativePath=".\GUIBaseContainer.h">

-			</File>

-			<File

-				RelativePath=".\GUIBorderedImage.h">

-			</File>

-			<File

-				RelativePath=".\GUIButtonControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIButtonScroller.h">

-			</File>

-			<File

-				RelativePath=".\GUICallback.h">

-			</File>

-			<File

-				RelativePath=".\GUICheckMarkControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIColorManager.h">

-			</File>

-			<File

-				RelativePath=".\GUIControl.h">

-			</File>

-			<File

-				RelativePath=".\GuiControlFactory.h">

-			</File>

-			<File

-				RelativePath=".\GUIControlGroup.h">

-			</File>

-			<File

-				RelativePath=".\GUIControlGroupList.h">

-			</File>

-			<File

-				RelativePath=".\GUIDialog.h">

-			</File>

-			<File

-				RelativePath=".\GUIEditControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIFadeLabelControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIFixedListContainer.h">

-			</File>

-			<File

-				RelativePath=".\GUIFont.h">

-			</File>

-			<File

-				RelativePath=".\GUIFontManager.h">

-			</File>

-			<File

-				RelativePath=".\GUIFontTTF.h">

-			</File>

-			<File

-				RelativePath=".\guiImage.h">

-			</File>

-			<File

-				RelativePath=".\GUIIncludes.h">

-			</File>

-			<File

-				RelativePath=".\GUIInfoColor.h">

-			</File>

-			<File

-				RelativePath=".\GUILabelControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIListContainer.h">

-			</File>

-			<File

-				RelativePath=".\GUIListGroup.h">

-			</File>

-			<File

-				RelativePath=".\GUIListItem.h">

-			</File>

-			<File

-				RelativePath=".\GUIListItemLayout.h">

-			</File>

-			<File

-				RelativePath=".\GUIListLabel.h">

-			</File>

-			<File

-				RelativePath=".\GUIMessage.h">

-			</File>

-			<File

-				RelativePath=".\GUIMoverControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIMultiImage.h">

-			</File>

-			<File

-				RelativePath=".\GUIMultiSelectText.h">

-			</File>

-			<File

-				RelativePath=".\GUIPanelContainer.h">

-			</File>

-			<File

-				RelativePath=".\GUIProgressControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIRadioButtonControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIResizeControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIRSSControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIScrollBarControl.h">

-			</File>

-			<File

-				RelativePath=".\GUISelectButtonControl.h">

-			</File>

-			<File

-				RelativePath=".\GUISettingsSliderControl.h">

-			</File>

-			<File

-				RelativePath=".\GUISliderControl.h">

-			</File>

-			<File

-				RelativePath=".\GUISound.h">

-			</File>

-			<File

-				RelativePath=".\GUISpinControl.h">

-			</File>

-			<File

-				RelativePath=".\GUISpinControlEx.h">

-			</File>

-			<File

-				RelativePath=".\GUIStandardWindow.h">

-			</File>

-			<File

-				RelativePath=".\GUITextBox.h">

-			</File>

-			<File

-				RelativePath=".\GUITextLayout.h">

-			</File>

-			<File

-				RelativePath=".\GUITexture.h">

-			</File>

-			<File

-				RelativePath=".\GUITextureD3D.h">

-			</File>

-			<File

-				RelativePath=".\GUITextureGL.h">

-			</File>

-			<File

-				RelativePath=".\GUITextureSDL.h">

-			</File>

-			<File

-				RelativePath=".\GUIToggleButtonControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIVideoControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIVisualisationControl.h">

-			</File>

-			<File

-				RelativePath=".\GUIWindow.h">

-			</File>

-			<File

-				RelativePath=".\GUIWindowManager.h">

-			</File>

-			<File

-				RelativePath=".\GUIWrappingListContainer.h">

-			</File>

-			<File

-				RelativePath=".\IAudioDeviceChangedCallback.h">

-			</File>

-			<File

-				RelativePath=".\IMsgSenderCallback.h">

-			</File>

-			<File

-				RelativePath=".\IMsgTargetCallback.h">

-			</File>

-			<File

-				RelativePath=".\include.h">

-			</File>

-			<File

-				RelativePath=".\IWindowManagerCallback.h">

-			</File>

-			<File

-				RelativePath=".\Key.h">

-			</File>

-			<File

-				RelativePath=".\LocalizeStrings.h">

-			</File>

-			<File

-				RelativePath=".\Shader.h">

-			</File>

-			<File

-				RelativePath=".\SkinInfo.h">

-			</File>

-			<File

-				RelativePath=".\StdString.h">

-			</File>

-			<File

-				RelativePath=".\Surface.h">

-			</File>

-			<File

-				RelativePath=".\system.h">

-			</File>

-			<File

-				RelativePath=".\TextureBundle.h">

-			</File>

-			<File

-				RelativePath=".\TextureManager.h">

-			</File>

-			<File

-				RelativePath=".\TransformMatrix.h">

-			</File>

-			<File

-				RelativePath=".\Tween.h">

-			</File>

-			<File

-				RelativePath=".\VisibleEffect.h">

-			</File>

-			<File

-				RelativePath=".\XMLUtils.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-		<Filter

-			Name="tinyxml"

-			Filter="">

-			<File

-				RelativePath=".\tinyXML\tinystr.cpp">

-			</File>

-			<File

-				RelativePath=".\tinyXML\tinystr.h">

-			</File>

-			<File

-				RelativePath=".\tinyXML\tinyxml.cpp">

-			</File>

-			<File

-				RelativePath=".\tinyXML\tinyxml.h">

-			</File>

-			<File

-				RelativePath=".\tinyXML\tinyxmlerror.cpp">

-			</File>

-			<File

-				RelativePath=".\tinyXML\tinyxmlparser.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="common"

-			Filter="">

-			<File

-				RelativePath=".\common\DirectInput.cpp">

-			</File>

-			<File

-				RelativePath=".\common\DirectInput.h">

-			</File>

-			<File

-				RelativePath=".\common\DirectInputKeyboard.cpp">

-			</File>

-			<File

-				RelativePath=".\common\DirectInputKeyboard.h">

-			</File>

-			<File

-				RelativePath=".\common\DirectInputMouse.cpp">

-			</File>

-			<File

-				RelativePath=".\common\DirectInputMouse.h">

-			</File>

-			<File

-				RelativePath=".\common\Keyboard.cpp">

-			</File>

-			<File

-				RelativePath=".\common\Keyboard.h">

-			</File>

-			<File

-				RelativePath=".\common\Mouse.cpp">

-			</File>

-			<File

-				RelativePath=".\common\Mouse.h">

-			</File>

-			<File

-				RelativePath=".\common\SDLJoystick.cpp">

-			</File>

-			<File

-				RelativePath=".\common\SDLJoystick.h">

-			</File>

-			<File

-				RelativePath=".\common\SDLKeyboard.cpp">

-			</File>

-			<File

-				RelativePath=".\common\SDLKeyboard.h">

-			</File>

-			<File

-				RelativePath=".\common\SDLMouse.cpp">

-			</File>

-			<File

-				RelativePath=".\common\SDLMouse.h">

-			</File>

-			<Filter

-				Name="IRServerSuite"

-				Filter="">

-				<File

-					RelativePath=".\common\IRServerSuite\IRServerSuite.cpp">

-				</File>

-				<File

-					RelativePath=".\common\IRServerSuite\IRServerSuite.h">

-				</File>

-				<File

-					RelativePath=".\common\IRServerSuite\IrssMessage.cpp">

-				</File>

-				<File

-					RelativePath=".\common\IRServerSuite\IrssMessage.h">

-				</File>

-			</Filter>

-		</Filter>

-		<File

-			RelativePath=".\ReadMe.txt">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="guilib"
+	ProjectGUID="{510441AC-B9E1-4B31-9C0C-EB3AD39D90C4}"
+	RootNamespace="guilib"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug (Win32)"
+			IntermediateDirectory="Debug (Win32)"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHa"
+				Optimization="0"
+				AdditionalIncludeDirectories="../xbmc/;freetype2/include;../xbmc/lib/boost"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"
+				StringPooling="FALSE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="include.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/guilib.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release (Win32)"
+			IntermediateDirectory="Release (Win32)"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../xbmc/;freetype2/include;../xbmc/lib/boost"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="include.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/guilib.lib"
+				IgnoreDefaultLibraryNames=""/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug (SDL)|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHa"
+				Optimization="0"
+				AdditionalIncludeDirectories="../guilib;../xbmc/Win32;../xbmc/;freetype2/include;../xbmc/lib/boost;../xbmc/utils;&quot;../xbmc/lib/libSDL-WIN32/include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"
+				StringPooling="FALSE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableEnhancedInstructionSet="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="include.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/guilib.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release (SDL)|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="../guilib;../xbmc/win32;../xbmc;freetype2\include;../xbmc/lib/boost;../xbmc/utils;&quot;../xbmc/lib/libSDL-WIN32/include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0500"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="0"
+				EnableEnhancedInstructionSet="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="include.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/guilib.lib"
+				AdditionalLibraryDirectories=""
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames=""/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\AnimatedGif.cpp">
+			</File>
+			<File
+				RelativePath=".\AudioContext.cpp">
+			</File>
+			<File
+				RelativePath=".\DirectXGraphics.cpp">
+			</File>
+			<File
+				RelativePath=".\FrameBufferObject.cpp">
+			</File>
+			<File
+				RelativePath=".\GraphicContext.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIAudioManager.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIBaseContainer.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIBorderedImage.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIButtonControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIButtonScroller.cpp">
+			</File>
+			<File
+				RelativePath=".\GUICheckMarkControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIColorManager.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GuiControlFactory.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIControlGroup.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIControlGroupList.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIDialog.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIEditControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIFadeLabelControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIFixedListContainer.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIFont.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIFontManager.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIFontTTF.cpp">
+			</File>
+			<File
+				RelativePath=".\guiImage.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIIncludes.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIInfoColor.cpp">
+			</File>
+			<File
+				RelativePath=".\GUILabelControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIListContainer.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIListGroup.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIListItem.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIListItemLayout.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIListLabel.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIMessage.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIMoverControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIMultiImage.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIMultiSelectText.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIPanelContainer.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIProgressControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIRadioButtonControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIResizeControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIRSSControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIScrollBarControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISelectButtonControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISettingsSliderControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISliderControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISound.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISpinControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUISpinControlEx.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIStandardWindow.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITextBox.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITextLayout.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITexture.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITextureD3D.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITextureGL.cpp">
+			</File>
+			<File
+				RelativePath=".\GUITextureSDL.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIToggleButtonControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIVideoControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIVisualisationControl.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIWindow.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIWindowManager.cpp">
+			</File>
+			<File
+				RelativePath=".\GUIWrappingListContainer.cpp">
+			</File>
+			<File
+				RelativePath=".\include.cpp">
+			</File>
+			<File
+				RelativePath=".\IWindowManagerCallback.cpp">
+			</File>
+			<File
+				RelativePath=".\Key.cpp">
+			</File>
+			<File
+				RelativePath=".\LocalizeStrings.cpp">
+			</File>
+			<File
+				RelativePath=".\Shader.cpp">
+			</File>
+			<File
+				RelativePath=".\SkinInfo.cpp">
+			</File>
+			<File
+				RelativePath=".\Surface.cpp">
+			</File>
+			<File
+				RelativePath=".\TextureBundle.cpp">
+			</File>
+			<File
+				RelativePath=".\TextureManager.cpp">
+			</File>
+			<File
+				RelativePath=".\VisibleEffect.cpp">
+			</File>
+			<File
+				RelativePath=".\XMLUtils.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\AnimatedGif.h">
+			</File>
+			<File
+				RelativePath=".\AudioContext.h">
+			</File>
+			<File
+				RelativePath=".\DirectXGraphics.h">
+			</File>
+			<File
+				RelativePath=".\FrameBufferObject.h">
+			</File>
+			<File
+				RelativePath=".\Geometry.h">
+			</File>
+			<File
+				RelativePath=".\GraphicContext.h">
+			</File>
+			<File
+				RelativePath=".\gui3d.h">
+			</File>
+			<File
+				RelativePath=".\GUIAudioManager.h">
+			</File>
+			<File
+				RelativePath=".\GUIBaseContainer.h">
+			</File>
+			<File
+				RelativePath=".\GUIBorderedImage.h">
+			</File>
+			<File
+				RelativePath=".\GUIButtonControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIButtonScroller.h">
+			</File>
+			<File
+				RelativePath=".\GUICallback.h">
+			</File>
+			<File
+				RelativePath=".\GUICheckMarkControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIColorManager.h">
+			</File>
+			<File
+				RelativePath=".\GUIControl.h">
+			</File>
+			<File
+				RelativePath=".\GuiControlFactory.h">
+			</File>
+			<File
+				RelativePath=".\GUIControlGroup.h">
+			</File>
+			<File
+				RelativePath=".\GUIControlGroupList.h">
+			</File>
+			<File
+				RelativePath=".\GUIDialog.h">
+			</File>
+			<File
+				RelativePath=".\GUIEditControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIFadeLabelControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIFixedListContainer.h">
+			</File>
+			<File
+				RelativePath=".\GUIFont.h">
+			</File>
+			<File
+				RelativePath=".\GUIFontManager.h">
+			</File>
+			<File
+				RelativePath=".\GUIFontTTF.h">
+			</File>
+			<File
+				RelativePath=".\guiImage.h">
+			</File>
+			<File
+				RelativePath=".\GUIIncludes.h">
+			</File>
+			<File
+				RelativePath=".\GUIInfoColor.h">
+			</File>
+			<File
+				RelativePath=".\GUILabelControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIListContainer.h">
+			</File>
+			<File
+				RelativePath=".\GUIListGroup.h">
+			</File>
+			<File
+				RelativePath=".\GUIListItem.h">
+			</File>
+			<File
+				RelativePath=".\GUIListItemLayout.h">
+			</File>
+			<File
+				RelativePath=".\GUIListLabel.h">
+			</File>
+			<File
+				RelativePath=".\GUIMessage.h">
+			</File>
+			<File
+				RelativePath=".\GUIMoverControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIMultiImage.h">
+			</File>
+			<File
+				RelativePath=".\GUIMultiSelectText.h">
+			</File>
+			<File
+				RelativePath=".\GUIPanelContainer.h">
+			</File>
+			<File
+				RelativePath=".\GUIProgressControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIRadioButtonControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIResizeControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIRSSControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIScrollBarControl.h">
+			</File>
+			<File
+				RelativePath=".\GUISelectButtonControl.h">
+			</File>
+			<File
+				RelativePath=".\GUISettingsSliderControl.h">
+			</File>
+			<File
+				RelativePath=".\GUISliderControl.h">
+			</File>
+			<File
+				RelativePath=".\GUISound.h">
+			</File>
+			<File
+				RelativePath=".\GUISpinControl.h">
+			</File>
+			<File
+				RelativePath=".\GUISpinControlEx.h">
+			</File>
+			<File
+				RelativePath=".\GUIStandardWindow.h">
+			</File>
+			<File
+				RelativePath=".\GUITextBox.h">
+			</File>
+			<File
+				RelativePath=".\GUITextLayout.h">
+			</File>
+			<File
+				RelativePath=".\GUITexture.h">
+			</File>
+			<File
+				RelativePath=".\GUITextureD3D.h">
+			</File>
+			<File
+				RelativePath=".\GUITextureGL.h">
+			</File>
+			<File
+				RelativePath=".\GUITextureSDL.h">
+			</File>
+			<File
+				RelativePath=".\GUIToggleButtonControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIVideoControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIVisualisationControl.h">
+			</File>
+			<File
+				RelativePath=".\GUIWindow.h">
+			</File>
+			<File
+				RelativePath=".\GUIWindowManager.h">
+			</File>
+			<File
+				RelativePath=".\GUIWrappingListContainer.h">
+			</File>
+			<File
+				RelativePath=".\IAudioDeviceChangedCallback.h">
+			</File>
+			<File
+				RelativePath=".\IMsgSenderCallback.h">
+			</File>
+			<File
+				RelativePath=".\IMsgTargetCallback.h">
+			</File>
+			<File
+				RelativePath=".\include.h">
+			</File>
+			<File
+				RelativePath=".\IWindowManagerCallback.h">
+			</File>
+			<File
+				RelativePath=".\Key.h">
+			</File>
+			<File
+				RelativePath=".\LocalizeStrings.h">
+			</File>
+			<File
+				RelativePath=".\Shader.h">
+			</File>
+			<File
+				RelativePath=".\SkinInfo.h">
+			</File>
+			<File
+				RelativePath=".\StdString.h">
+			</File>
+			<File
+				RelativePath=".\Surface.h">
+			</File>
+			<File
+				RelativePath=".\system.h">
+			</File>
+			<File
+				RelativePath=".\TextureBundle.h">
+			</File>
+			<File
+				RelativePath=".\TextureManager.h">
+			</File>
+			<File
+				RelativePath=".\TransformMatrix.h">
+			</File>
+			<File
+				RelativePath=".\Tween.h">
+			</File>
+			<File
+				RelativePath=".\VisibleEffect.h">
+			</File>
+			<File
+				RelativePath=".\XMLUtils.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+		<Filter
+			Name="tinyxml"
+			Filter="">
+			<File
+				RelativePath=".\tinyXML\tinystr.cpp">
+			</File>
+			<File
+				RelativePath=".\tinyXML\tinystr.h">
+			</File>
+			<File
+				RelativePath=".\tinyXML\tinyxml.cpp">
+			</File>
+			<File
+				RelativePath=".\tinyXML\tinyxml.h">
+			</File>
+			<File
+				RelativePath=".\tinyXML\tinyxmlerror.cpp">
+			</File>
+			<File
+				RelativePath=".\tinyXML\tinyxmlparser.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="common"
+			Filter="">
+			<File
+				RelativePath=".\common\DirectInput.cpp">
+			</File>
+			<File
+				RelativePath=".\common\DirectInput.h">
+			</File>
+			<File
+				RelativePath=".\common\DirectInputKeyboard.cpp">
+			</File>
+			<File
+				RelativePath=".\common\DirectInputKeyboard.h">
+			</File>
+			<File
+				RelativePath=".\common\DirectInputMouse.cpp">
+			</File>
+			<File
+				RelativePath=".\common\DirectInputMouse.h">
+			</File>
+			<File
+				RelativePath=".\common\Keyboard.cpp">
+			</File>
+			<File
+				RelativePath=".\common\Keyboard.h">
+			</File>
+			<File
+				RelativePath=".\common\Mouse.cpp">
+			</File>
+			<File
+				RelativePath=".\common\Mouse.h">
+			</File>
+			<File
+				RelativePath=".\common\SDLJoystick.cpp">
+			</File>
+			<File
+				RelativePath=".\common\SDLJoystick.h">
+			</File>
+			<File
+				RelativePath=".\common\SDLKeyboard.cpp">
+			</File>
+			<File
+				RelativePath=".\common\SDLKeyboard.h">
+			</File>
+			<File
+				RelativePath=".\common\SDLMouse.cpp">
+			</File>
+			<File
+				RelativePath=".\common\SDLMouse.h">
+			</File>
+			<Filter
+				Name="IRServerSuite"
+				Filter="">
+				<File
+					RelativePath=".\common\IRServerSuite\IRServerSuite.cpp">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IRServerSuite.h">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IrssMessage.cpp">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IrssMessage.h">
+				</File>
+			</Filter>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>