Revert "Merge remote branch 'upstream/master'"

This reverts commit 4e98a514c6a2975ec234fe19fe058e7e74bcfb7d, reversing
changes made to 8d73cbde1dcd240d80bee9301d0321703a15c995.

18 files changed, 0 insertions, 1829 deletions

diff --git a/lib/addons/library.xbmc.addon/Makefile.in b/lib/addons/library.xbmc.addon/Makefile.in
deleted file mode 100644
index 56afe6cbab..0000000000
--- a/lib/addons/library.xbmc.addon/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc
-DEFINES+=
-CXXFLAGS=-fPIC
-LIBNAME=libXBMC_addon
-OBJS=$(LIBNAME).o
-
-LIB_SHARED=../../../addons/library.xbmc.addon/$(LIBNAME)-$(ARCH).so
-
-all: $(LIB_SHARED)
-
-$(LIB_SHARED): $(OBJS)
-ifeq ($(findstring osx,$(ARCH)), osx)
-	@export MACOSX_DEPLOYMENT_TARGET=10.4
-	$(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS)
-	../../../tools/Mach5/wrapper.rb $@;mv output.so $@
-else
-	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
-endif
-
-CLEAN_FILES = \
-	$(LIBNAME).so \
-
-DISTCLEAN_FILES= \
-	Makefile \
-
-include ../../../Makefile.include
diff --git a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp
deleted file mode 100644
index 22651af154..0000000000
--- a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *      Copyright (C) 2005-2010 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 <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string>
-#include "../../../addons/library.xbmc.addon/libXBMC_addon.h"
-#include "../../../xbmc/addons/AddonHelpers_local.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#define DLLEXPORT __declspec(dllexport)
-#else
-#define DLLEXPORT
-#endif
-
-
-using namespace std;
-
-AddonCB *m_Handle = NULL;
-CB_AddOnLib *m_cb = NULL;
-
-extern "C"
-{
-
-DLLEXPORT int XBMC_register_me(void *hdl)
-{
-  if (!hdl)
-    fprintf(stderr, "libXBMC_addon-ERROR: XBMC_register_me is called with NULL handle !!!\n");
-  else
-  {
-    m_Handle = (AddonCB*) hdl;
-    m_cb     = m_Handle->AddOnLib_RegisterMe(m_Handle->addonData);
-    if (!m_cb)
-      fprintf(stderr, "libXBMC_addon-ERROR: XBMC_register_me can't get callback table from XBMC !!!\n");
-    else
-      return 1;
-  }
-  return 0;
-}
-
-DLLEXPORT void XBMC_unregister_me()
-{
-  if (m_Handle && m_cb)
-    m_Handle->AddOnLib_UnRegisterMe(m_Handle->addonData, m_cb);
-}
-
-DLLEXPORT void XBMC_log(const addon_log_t loglevel, const char *format, ... )
-{
-  if (m_cb == NULL)
-    return;
-
-  char buffer[16384];
-  va_list args;
-  va_start (args, format);
-  vsprintf (buffer, format, args);
-  va_end (args);
-  m_cb->Log(m_Handle->addonData, loglevel, buffer);
-}
-
-DLLEXPORT bool XBMC_get_setting(const char* settingName, void *settingValue)
-{
-  if (m_cb == NULL)
-    return false;
-
-  return m_cb->GetSetting(m_Handle->addonData, settingName, settingValue);
-}
-
-DLLEXPORT void XBMC_queue_notification(const queue_msg_t type, const char *format, ... )
-{
-  if (m_cb == NULL)
-    return;
-
-  char buffer[16384];
-  va_list args;
-  va_start (args, format);
-  vsprintf (buffer, format, args);
-  va_end (args);
-  m_cb->QueueNotification(m_Handle->addonData, type, buffer);
-}
-
-DLLEXPORT void XBMC_unknown_to_utf8(string &str)
-{
-  if (m_cb == NULL)
-    return;
-
-  string buffer = m_cb->UnknownToUTF8(str.c_str());
-  str = buffer;
-}
-
-DLLEXPORT const char* XBMC_get_localized_string(int dwCode)
-{
-  if (m_cb == NULL)
-    return "";
-
-  string buffer = m_cb->GetLocalizedString(m_Handle->addonData, dwCode);
-  return buffer.c_str();
-}
-
-DLLEXPORT const char* XBMC_get_dvd_menu_language()
-{
-  if (m_cb == NULL)
-    return "";
-
-  string buffer = m_cb->GetDVDMenuLanguage(m_Handle->addonData);
-  return buffer.c_str();
-}
-
-};
diff --git a/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.sln b/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.sln
deleted file mode 100644
index e73e8decc5..0000000000
--- a/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_addon", "libXBMC_addon.vcproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Debug|Win32.Build.0 = Debug|Win32
-		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Release|Win32.ActiveCfg = Release|Win32
-		{D450FE9A-CE56-4496-B4AB-379094E642F2}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.vcproj b/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.vcproj
deleted file mode 100644
index d8bf113df7..0000000000
--- a/lib/addons/library.xbmc.addon/project/VS2008Express/libXBMC_addon.vcproj
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libXBMC_addon"
-	ProjectGUID="{2DCEA60B-4EBC-4DB7-9FBD-297C1EFD95D7}"
-	RootNamespace="XBMC_VDR"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc"
-				PreprocessorDefinitions="_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.addon/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="1"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.addon/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\..\libXBMC_addon.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
deleted file mode 100644
index af5c26fc7a..0000000000
--- a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2DCEA60B-4EBC-4DB7-9FBD-297C1EFD95D7}</ProjectGuid>
-    <RootNamespace>XBMC_VDR</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.xbmc.addon\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.xbmc.addon\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\addons\library.xbmc.addon\$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\addons\library.xbmc.addon\$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_addon.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\..\addons\library.xbmc.addon\libXBMC_addon.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj.filters b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj.filters
deleted file mode 100644
index 916673ca41..0000000000
--- a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_addon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\..\addons\library.xbmc.addon\libXBMC_addon.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.gui/Makefile.in b/lib/addons/library.xbmc.gui/Makefile.in
deleted file mode 100644
index 692106695f..0000000000
--- a/lib/addons/library.xbmc.gui/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
-DEFINES+=
-CXXFLAGS=-fPIC
-LIBNAME=libXBMC_gui
-OBJS=$(LIBNAME).o
-
-LIB_SHARED=../../../addons/library.xbmc.gui/$(LIBNAME)-$(ARCH).so
-
-all: $(LIB_SHARED)
-
-$(LIB_SHARED): $(OBJS)
-ifeq ($(findstring osx,$(ARCH)), osx)
-	@export MACOSX_DEPLOYMENT_TARGET=10.4
-	$(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS)
-	../../../tools/Mach5/wrapper.rb $@;mv output.so $@
-else
-	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
-endif
-
-CLEAN_FILES = \
-	$(LIB_SHARED) \
-
-DISTCLEAN_FILES= \
-	Makefile \
-
-include ../../../Makefile.include
diff --git a/lib/addons/library.xbmc.gui/libXBMC_gui.cpp b/lib/addons/library.xbmc.gui/libXBMC_gui.cpp
deleted file mode 100644
index 3c2898dee5..0000000000
--- a/lib/addons/library.xbmc.gui/libXBMC_gui.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- *      Copyright (C) 2005-2010 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 <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string>
-#include "../../../addons/library.xbmc.gui/libXBMC_gui.h"
-#include "addons/AddonHelpers_local.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#define DLLEXPORT __declspec(dllexport)
-#else
-#define DLLEXPORT
-#endif
-
-using namespace std;
-
-AddonCB *m_Handle = NULL;
-CB_GUILib *m_cb   = NULL;
-
-extern "C"
-{
-
-DLLEXPORT int GUI_register_me(void *hdl)
-{
-  if (!hdl)
-    fprintf(stderr, "libXBMC_gui-ERROR: GUILib_register_me is called with NULL handle !!!\n");
-  else
-  {
-    m_Handle = (AddonCB*) hdl;
-    m_cb     = m_Handle->GUILib_RegisterMe(m_Handle->addonData);
-    if (!m_cb)
-      fprintf(stderr, "libXBMC_gui-ERROR: GUILib_register_me can't get callback table from XBMC !!!\n");
-    else
-      return 1;
-  }
-  return 0;
-}
-
-DLLEXPORT void GUI_unregister_me()
-{
-  if (m_Handle && m_cb)
-    m_Handle->GUILib_UnRegisterMe(m_Handle->addonData, m_cb);
-}
-
-DLLEXPORT void GUI_lock()
-{
-  m_cb->Lock();
-}
-
-DLLEXPORT void GUI_unlock()
-{
-  m_cb->Unlock();
-}
-
-DLLEXPORT int GUI_get_screen_height()
-{
-  return m_cb->GetScreenHeight();
-}
-
-DLLEXPORT int GUI_get_screen_width()
-{
-  return m_cb->GetScreenWidth();
-}
-
-DLLEXPORT int GUI_get_video_resolution()
-{
-  return m_cb->GetVideoResolution();
-}
-
-DLLEXPORT cGUIWindow* GUI_Window_create(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
-{
-  return new cGUIWindow(xmlFilename, defaultSkin, forceFallback, asDialog);
-}
-
-DLLEXPORT void GUI_Window_destroy(cGUIWindow* p)
-{
-  delete p;
-}
-
-DLLEXPORT bool GUI_Window_OnClick(GUIHANDLE handle, int controlId)
-{
-  cGUIWindow *window = (cGUIWindow*) handle;
-  return window->OnClick(controlId);
-}
-
-DLLEXPORT bool GUI_Window_OnFocus(GUIHANDLE handle, int controlId)
-{
-  cGUIWindow *window = (cGUIWindow*) handle;
-  return window->OnFocus(controlId);
-}
-
-DLLEXPORT bool GUI_Window_OnInit(GUIHANDLE handle)
-{
-  cGUIWindow *window = (cGUIWindow*) handle;
-  return window->OnInit();
-}
-
-DLLEXPORT bool GUI_Window_OnAction(GUIHANDLE handle, int actionId)
-{
-  cGUIWindow *window = (cGUIWindow*) handle;
-  return window->OnAction(actionId);
-}
-
-
-cGUIWindow::cGUIWindow(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
-{
-  CBOnInit = NULL;
-  CBOnClick = NULL;
-  CBOnFocus = NULL;
-  if (m_Handle && m_cb)
-  {
-    m_WindowHandle = m_cb->Window_New(m_Handle->addonData, xmlFilename, defaultSkin, forceFallback, asDialog);
-    if (!m_WindowHandle)
-      fprintf(stderr, "libXBMC_gui-ERROR: cGUIWindow can't create window class from XBMC !!!\n");
-
-    m_cb->Window_SetCallbacks(m_Handle->addonData, m_WindowHandle, this, GUI_Window_OnInit, GUI_Window_OnClick, GUI_Window_OnFocus, GUI_Window_OnAction);
-  }
-}
-
-cGUIWindow::~cGUIWindow()
-{
-  if (m_Handle && m_cb && m_WindowHandle)
-  {
-    m_cb->Window_Delete(m_Handle->addonData, m_WindowHandle);
-    m_WindowHandle = NULL;
-  }
-}
-
-bool cGUIWindow::Show()
-{
-  return m_cb->Window_Show(m_Handle->addonData, m_WindowHandle);
-}
-
-void cGUIWindow::Close()
-{
-  m_cb->Window_Close(m_Handle->addonData, m_WindowHandle);
-}
-
-void cGUIWindow::DoModal()
-{
-  m_cb->Window_DoModal(m_Handle->addonData, m_WindowHandle);
-}
-
-bool cGUIWindow::OnInit()
-{
-  if (!CBOnInit)
-    return false;
-
-  return CBOnInit(m_cbhdl);
-}
-
-bool cGUIWindow::OnClick(int controlId)
-{
-  if (!CBOnClick)
-    return false;
-
-  return CBOnClick(m_cbhdl, controlId);
-}
-
-bool cGUIWindow::OnFocus(int controlId)
-{
-  if (!CBOnFocus)
-    return false;
-
-  return CBOnFocus(m_cbhdl, controlId);
-}
-
-bool cGUIWindow::OnAction(int actionId)
-{
-  if (!CBOnAction)
-    return false;
-
-  return CBOnAction(m_cbhdl, actionId);
-}
-
-bool cGUIWindow::SetFocusId(int iControlId)
-{
-  return m_cb->Window_SetFocusId(m_Handle->addonData, m_WindowHandle, iControlId);
-}
-
-int cGUIWindow::GetFocusId()
-{
-  return m_cb->Window_GetFocusId(m_Handle->addonData, m_WindowHandle);
-}
-
-bool cGUIWindow::SetCoordinateResolution(int res)
-{
-  return m_cb->Window_SetCoordinateResolution(m_Handle->addonData, m_WindowHandle, res);
-}
-
-void cGUIWindow::SetProperty(const char *key, const char *value)
-{
-  m_cb->Window_SetProperty(m_Handle->addonData, m_WindowHandle, key, value);
-}
-
-void cGUIWindow::SetPropertyInt(const char *key, int value)
-{
-  m_cb->Window_SetPropertyInt(m_Handle->addonData, m_WindowHandle, key, value);
-}
-
-void cGUIWindow::SetPropertyBool(const char *key, bool value)
-{
-  m_cb->Window_SetPropertyBool(m_Handle->addonData, m_WindowHandle, key, value);
-}
-
-void cGUIWindow::SetPropertyDouble(const char *key, double value)
-{
-  m_cb->Window_SetPropertyDouble(m_Handle->addonData, m_WindowHandle, key, value);
-}
-
-const char *cGUIWindow::GetProperty(const char *key) const
-{
-  return m_cb->Window_GetProperty(m_Handle->addonData, m_WindowHandle, key);
-}
-
-int cGUIWindow::GetPropertyInt(const char *key) const
-{
-  return m_cb->Window_GetPropertyInt(m_Handle->addonData, m_WindowHandle, key);
-}
-
-bool cGUIWindow::GetPropertyBool(const char *key) const
-{
-  return m_cb->Window_GetPropertyBool(m_Handle->addonData, m_WindowHandle, key);
-}
-
-double cGUIWindow::GetPropertyDouble(const char *key) const
-{
-  return m_cb->Window_GetPropertyDouble(m_Handle->addonData, m_WindowHandle, key);
-}
-
-void cGUIWindow::ClearProperties()
-{
-  m_cb->Window_ClearProperties(m_Handle->addonData, m_WindowHandle);
-}
-
-int cGUIWindow::GetListSize()
-{
-  return m_cb->Window_GetListSize(m_Handle->addonData, m_WindowHandle);
-}
-
-void cGUIWindow::ClearList()
-{
-  m_cb->Window_ClearList(m_Handle->addonData, m_WindowHandle);
-}
-
-GUIHANDLE cGUIWindow::AddStringItem(const char *name, int itemPosition)
-{
-  return m_cb->Window_AddStringItem(m_Handle->addonData, m_WindowHandle, name, itemPosition);
-}
-
-void cGUIWindow::AddItem(GUIHANDLE item, int itemPosition)
-{
-  m_cb->Window_AddItem(m_Handle->addonData, m_WindowHandle, item, itemPosition);
-}
-
-void cGUIWindow::AddItem(cListItem *item, int itemPosition)
-{
-  m_cb->Window_AddItem(m_Handle->addonData, m_WindowHandle, item->m_ListItemHandle, itemPosition);
-}
-
-void cGUIWindow::RemoveItem(int itemPosition)
-{
-  m_cb->Window_RemoveItem(m_Handle->addonData, m_WindowHandle, itemPosition);
-}
-
-GUIHANDLE cGUIWindow::GetListItem(int listPos)
-{
-  return m_cb->Window_GetListItem(m_Handle->addonData, m_WindowHandle, listPos);
-}
-
-void cGUIWindow::SetCurrentListPosition(int listPos)
-{
-  m_cb->Window_SetCurrentListPosition(m_Handle->addonData, m_WindowHandle, listPos);
-}
-
-int cGUIWindow::GetCurrentListPosition()
-{
-  return m_cb->Window_GetCurrentListPosition(m_Handle->addonData, m_WindowHandle);
-}
-
-void cGUIWindow::SetControlLabel(int controlId, const char *label)
-{
-  m_cb->Window_SetControlLabel(m_Handle->addonData, m_WindowHandle, controlId, label);
-}
-
-///-------------------------------------
-/// cGUISpinControl
-
-DLLEXPORT cGUISpinControl* GUI_control_get_spin(cGUIWindow *window, int controlId)
-{
-  return new cGUISpinControl(window, controlId);
-}
-
-DLLEXPORT void GUI_control_release_spin(cGUISpinControl* p)
-{
-  delete p;
-}
-
-cGUISpinControl::cGUISpinControl(cGUIWindow *window, int controlId)
- : m_Window(window)
- , m_ControlId(controlId)
-{
-  m_SpinHandle = m_cb->Window_GetControl_Spin(m_Handle->addonData, m_Window->m_WindowHandle, controlId);
-}
-
-void cGUISpinControl::SetVisible(bool yesNo)
-{
-  if (m_SpinHandle)
-    m_cb->Control_Spin_SetVisible(m_Handle->addonData, m_SpinHandle, yesNo);
-}
-
-void cGUISpinControl::SetText(const char *label)
-{
-  if (m_SpinHandle)
-    m_cb->Control_Spin_SetText(m_Handle->addonData, m_SpinHandle, label);
-}
-
-void cGUISpinControl::Clear()
-{
-  if (m_SpinHandle)
-    m_cb->Control_Spin_Clear(m_Handle->addonData, m_SpinHandle);
-}
-
-void cGUISpinControl::AddLabel(const char *label, int iValue)
-{
-  if (m_SpinHandle)
-    m_cb->Control_Spin_AddLabel(m_Handle->addonData, m_SpinHandle, label, iValue);
-}
-
-int cGUISpinControl::GetValue()
-{
-  if (!m_SpinHandle)
-    return -1;
-
-  return m_cb->Control_Spin_GetValue(m_Handle->addonData, m_SpinHandle);
-}
-
-void cGUISpinControl::SetValue(int iValue)
-{
-  if (m_SpinHandle)
-    m_cb->Control_Spin_SetValue(m_Handle->addonData, m_SpinHandle, iValue);
-}
-
-///-------------------------------------
-/// cGUIRadioButton
-
-DLLEXPORT cGUIRadioButton* GUI_control_get_radiobutton(cGUIWindow *window, int controlId)
-{
-  return new cGUIRadioButton(window, controlId);
-}
-
-DLLEXPORT void GUI_control_release_radiobutton(cGUIRadioButton* p)
-{
-  delete p;
-}
-
-cGUIRadioButton::cGUIRadioButton(cGUIWindow *window, int controlId)
- : m_Window(window)
- , m_ControlId(controlId)
-{
-  m_ButtonHandle = m_cb->Window_GetControl_RadioButton(m_Handle->addonData, m_Window->m_WindowHandle, controlId);
-}
-
-void cGUIRadioButton::SetVisible(bool yesNo)
-{
-  if (m_ButtonHandle)
-    m_cb->Control_RadioButton_SetVisible(m_Handle->addonData, m_ButtonHandle, yesNo);
-}
-
-void cGUIRadioButton::SetText(const char *label)
-{
-  if (m_ButtonHandle)
-    m_cb->Control_RadioButton_SetText(m_Handle->addonData, m_ButtonHandle, label);
-}
-
-void cGUIRadioButton::SetSelected(bool yesNo)
-{
-  if (m_ButtonHandle)
-    m_cb->Control_RadioButton_SetSelected(m_Handle->addonData, m_ButtonHandle, yesNo);
-}
-
-bool cGUIRadioButton::IsSelected()
-{
-  if (!m_ButtonHandle)
-    return false;
-
-  return m_cb->Control_RadioButton_IsSelected(m_Handle->addonData, m_ButtonHandle);
-}
-
-
-///-------------------------------------
-/// cGUIProgressControl
-
-DLLEXPORT cGUIProgressControl* GUI_control_get_progress(cGUIWindow *window, int controlId)
-{
-  return new cGUIProgressControl(window, controlId);
-}
-
-DLLEXPORT void GUI_control_release_progress(cGUIProgressControl* p)
-{
-  delete p;
-}
-
-cGUIProgressControl::cGUIProgressControl(cGUIWindow *window, int controlId)
- : m_Window(window)
- , m_ControlId(controlId)
-{
-  m_ProgressHandle = m_cb->Window_GetControl_Progress(m_Handle->addonData, m_Window->m_WindowHandle, controlId);
-}
-
-void cGUIProgressControl::SetPercentage(float fPercent)
-{
-  if (m_ProgressHandle)
-    m_cb->Control_Progress_SetPercentage(m_Handle->addonData, m_ProgressHandle, fPercent);
-}
-
-float cGUIProgressControl::GetPercentage() const
-{
-  if (!m_ProgressHandle)
-    return 0.0;
-
-  return m_cb->Control_Progress_GetPercentage(m_Handle->addonData, m_ProgressHandle);
-}
-
-void cGUIProgressControl::SetInfo(int iInfo)
-{
-  if (m_ProgressHandle)
-    m_cb->Control_Progress_SetInfo(m_Handle->addonData, m_ProgressHandle, iInfo);
-}
-
-int cGUIProgressControl::GetInfo() const
-{
-  if (!m_ProgressHandle)
-    return -1;
-
-  return m_cb->Control_Progress_GetInfo(m_Handle->addonData, m_ProgressHandle);
-}
-
-string cGUIProgressControl::GetDescription() const
-{
-  if (!m_ProgressHandle)
-    return "";
-
-  return m_cb->Control_Progress_GetDescription(m_Handle->addonData, m_ProgressHandle);
-}
-
-
-///-------------------------------------
-/// cListItem
-
-DLLEXPORT cListItem* GUI_ListItem_create(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
-{
-  return new cListItem(label, label2, iconImage, thumbnailImage, path);
-}
-
-DLLEXPORT void GUI_ListItem_destroy(cListItem* p)
-{
-  delete p;
-}
-
-
-cListItem::cListItem(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
-{
-  m_ListItemHandle = m_cb->ListItem_Create(m_Handle->addonData, label, label2, iconImage, thumbnailImage, path);
-}
-
-const char *cListItem::GetLabel()
-{
-  if (!m_ListItemHandle)
-    return "";
-
-  return m_cb->ListItem_GetLabel(m_Handle->addonData, m_ListItemHandle);
-}
-
-void cListItem::SetLabel(const char *label)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetLabel(m_Handle->addonData, m_ListItemHandle, label);
-}
-
-const char *cListItem::GetLabel2()
-{
-  if (!m_ListItemHandle)
-    return "";
-
-  return m_cb->ListItem_GetLabel2(m_Handle->addonData, m_ListItemHandle);
-}
-
-void cListItem::SetLabel2(const char *label)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetLabel2(m_Handle->addonData, m_ListItemHandle, label);
-}
-
-void cListItem::SetIconImage(const char *image)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetIconImage(m_Handle->addonData, m_ListItemHandle, image);
-}
-
-void cListItem::SetThumbnailImage(const char *image)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetThumbnailImage(m_Handle->addonData, m_ListItemHandle, image);
-}
-
-void cListItem::SetInfo(const char *Info)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetInfo(m_Handle->addonData, m_ListItemHandle, Info);
-}
-
-void cListItem::SetProperty(const char *key, const char *value)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetProperty(m_Handle->addonData, m_ListItemHandle, key, value);
-}
-
-const char *cListItem::GetProperty(const char *key) const
-{
-  if (!m_ListItemHandle)
-    return "";
-
-  return m_cb->ListItem_GetProperty(m_Handle->addonData, m_ListItemHandle, key);
-}
-
-void cListItem::SetPath(const char *Path)
-{
-  if (m_ListItemHandle)
-    m_cb->ListItem_SetPath(m_Handle->addonData, m_ListItemHandle, Path);
-}
-
-
-};
diff --git a/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.sln b/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.sln
deleted file mode 100644
index 39726e9e69..0000000000
--- a/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_gui", "libXBMC_gui.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.vcproj b/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.vcproj
deleted file mode 100644
index 2561231db5..0000000000
--- a/lib/addons/library.xbmc.gui/project/VS2008Express/libXBMC_gui.vcproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libXBMC_gui"
-	ProjectGUID="{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
-	RootNamespace="XBMC_VDR"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers"
-				PreprocessorDefinitions="_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.gui/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC"
-				ExceptionHandling="1"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.gui/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\..\libXBMC_gui.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
deleted file mode 100644
index 1a09551b92..0000000000
--- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectGuid>
-    <RootNamespace>XBMC_VDR</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.xbmc.gui\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.xbmc.gui\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\addons\library.xbmc.gui\$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>../../../../../addons/library.xbmc.gui/$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_gui.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters
deleted file mode 100644
index 166719621f..0000000000
--- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_gui.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.pvr/Makefile.in b/lib/addons/library.xbmc.pvr/Makefile.in
deleted file mode 100644
index cbba1899bd..0000000000
--- a/lib/addons/library.xbmc.pvr/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
-DEFINES+=
-CXXFLAGS=-fPIC
-LIBNAME=libXBMC_pvr
-OBJS=$(LIBNAME).o
-
-LIB_SHARED=../../../addons/library.xbmc.pvr/$(LIBNAME)-$(ARCH).so
-
-all: $(LIB_SHARED)
-
-$(LIB_SHARED): $(OBJS)
-ifeq ($(findstring osx,$(ARCH)), osx)
-	@export MACOSX_DEPLOYMENT_TARGET=10.4
-	$(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(LIB_SHARED) $(OBJS)
-	../../../tools/Mach5/wrapper.rb $@;mv output.so $@
-else
-	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
-endif
-
-CLEAN_FILES = \
-	$(LIB_SHARED) \
-
-DISTCLEAN_FILES= \
-	Makefile \
-
-include ../../../Makefile.include
diff --git a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
deleted file mode 100644
index 693b70487b..0000000000
--- a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *      Copyright (C) 2005-2010 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
- *
- */
-
-#define USE_DEMUX // enable including of the demuxer packet structure
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string>
-#include "../../../addons/library.xbmc.pvr/libXBMC_pvr.h"
-#include "addons/AddonHelpers_local.h"
-#include "cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#define DLLEXPORT __declspec(dllexport)
-#else
-#define DLLEXPORT
-#endif
-
-using namespace std;
-
-AddonCB *m_Handle = NULL;
-CB_PVRLib *m_cb   = NULL;
-
-extern "C"
-{
-
-DLLEXPORT int PVR_register_me(void *hdl)
-{
-  if (!hdl)
-    fprintf(stderr, "libXBMC_pvr-ERROR: PVRLib_register_me is called with NULL handle !!!\n");
-  else
-  {
-    m_Handle = (AddonCB*) hdl;
-    m_cb     = m_Handle->PVRLib_RegisterMe(m_Handle->addonData);
-    if (!m_cb)
-      fprintf(stderr, "libXBMC_pvr-ERROR: PVRLib_register_me can't get callback table from XBMC !!!\n");
-    else
-      return 1;
-  }
-  return 0;
-}
-
-DLLEXPORT void PVR_unregister_me()
-{
-  if (m_Handle && m_cb)
-    m_Handle->PVRLib_UnRegisterMe(m_Handle->addonData, m_cb);
-}
-
-DLLEXPORT void PVR_transfer_epg_entry(const PVRHANDLE handle, const PVR_PROGINFO *epgentry)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TransferEpgEntry(m_Handle->addonData, handle, epgentry);
-}
-
-DLLEXPORT void PVR_transfer_channel_entry(const PVRHANDLE handle, const PVR_CHANNEL *chan)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TransferChannelEntry(m_Handle->addonData, handle, chan);
-}
-
-DLLEXPORT void PVR_transfer_timer_entry(const PVRHANDLE handle, const PVR_TIMERINFO *timer)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TransferTimerEntry(m_Handle->addonData, handle, timer);
-}
-
-DLLEXPORT void PVR_transfer_recording_entry(const PVRHANDLE handle, const PVR_RECORDINGINFO *recording)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TransferRecordingEntry(m_Handle->addonData, handle, recording);
-}
-
-DLLEXPORT void PVR_add_menu_hook(PVR_MENUHOOK *hook)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->AddMenuHook(m_Handle->addonData, hook);
-}
-
-DLLEXPORT void PVR_recording(const char *Name, const char *FileName, bool On)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->Recording(m_Handle->addonData, Name, FileName, On);
-}
-
-DLLEXPORT void PVR_trigger_timer_update()
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TriggerTimerUpdate(m_Handle->addonData);
-}
-
-DLLEXPORT void PVR_trigger_recording_update()
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->TriggerTimerUpdate(m_Handle->addonData);
-}
-
-DLLEXPORT void PVR_free_demux_packet(DemuxPacket* pPacket)
-{
-  if (m_cb == NULL)
-    return;
-
-  m_cb->FreeDemuxPacket(m_Handle->addonData, pPacket);
-}
-
-DLLEXPORT DemuxPacket* PVR_allocate_demux_packet(int iDataSize)
-{
-  if (m_cb == NULL)
-    return NULL;
-
-  return m_cb->AllocateDemuxPacket(m_Handle->addonData, iDataSize);
-}
-
-};
diff --git a/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.sln b/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.sln
deleted file mode 100644
index ede20d8d39..0000000000
--- a/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_pvr", "libXBMC_pvr.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
-		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.vcproj b/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.vcproj
deleted file mode 100644
index 5a15178741..0000000000
--- a/lib/addons/library.xbmc.pvr/project/VS2008Express/libXBMC_pvr.vcproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libXBMC_pvr"
-	ProjectGUID="{6D8C91F8-992F-4C83-9DE3-485D64EF8420}"
-	RootNamespace="XBMC_VDR"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers"
-				PreprocessorDefinitions="_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.pvr/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC"
-				ExceptionHandling="1"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="../../../../../addons/library.xbmc.pvr/$(ProjectName).dll"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\..\libXBMC_pvr.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
deleted file mode 100644
index 3e386a06e4..0000000000
--- a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6D8C91F8-992F-4C83-9DE3-485D64EF8420}</ProjectGuid>
-    <RootNamespace>XBMC_VDR</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.xbmc.pvr\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.xbmc.pvr\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN32;_DEBUG;_WINDOWS;VDR_EXPORTS;_WIN32PC;_WINSOCKAPI_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\addons\library.xbmc.pvr\$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\addons\library.xbmc.pvr\$(ProjectName).dll</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_pvr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj.filters b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj.filters
deleted file mode 100644
index db93c59c90..0000000000
--- a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_pvr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file