[WIN32] [VS2010] Removed/updated headers 'cause it conflicted with vs2010 up-to-date check

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

3 files changed, 17 insertions, 53 deletions

diff --git a/project/VS2008Express/XBMC.vcproj b/project/VS2008Express/XBMC.vcproj
index e4021762ac..299843fa73 100644
--- a/project/VS2008Express/XBMC.vcproj
+++ b/project/VS2008Express/XBMC.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="XBMC"
 	ProjectGUID="{3A68081D-E8F9-4523-9436-530DE9E5530A}"
 	RootNamespace="XBMC_PC"
@@ -1592,10 +1592,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\cores\paplayer\DllAdplug.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\cores\paplayer\DllASAP.h"
 					>
 				</File>
@@ -1604,10 +1600,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\cores\paplayer\DllDumb.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\cores\paplayer\DllGensApu.h"
 					>
 				</File>
@@ -1620,10 +1612,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\cores\paplayer\DllMACDll.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\cores\paplayer\DllNosefart.h"
 					>
 				</File>
@@ -1752,10 +1740,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\cores\paplayer\RingHoldBuffer.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\cores\paplayer\SIDCodec.cpp"
 					>
 				</File>
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 28894f7e24..288953ec62 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -1099,14 +1099,14 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h" />

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h" />

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avcodec.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avformat.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avio.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\common.h" />

-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\decoder.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllAvCodec.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllAvFormat.h" />

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllPostProc.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvCodec.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvFormat.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllPostProc.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllSwScale.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include\libavutil\avconfig.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avformat.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avio.h" />

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavutil\common.h" />

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h" />

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h" />

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h" />

@@ -1139,14 +1139,10 @@
     <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllAc3codec.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllAdpcm.h" />

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllAdplug.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllASAP.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllDCACodec.h" />

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllDumb.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllGensApu.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllLibFlac.h" />

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllLibshnplay.h" />

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllMACDll.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllNosefart.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllSidplay2.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllStSound.h" />

@@ -1167,7 +1163,6 @@
     <ClInclude Include="..\..\xbmc\cores\paplayer\OGGcodec.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\PAPlayer.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\ReplayGain.h" />

-    <ClInclude Include="..\..\xbmc\cores\paplayer\RingHoldBuffer.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\SIDCodec.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\SPCCodec.h" />

     <ClInclude Include="..\..\xbmc\cores\paplayer\TimidityCodec.h" />

diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 414ab4ad0a..60a806317e 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -2429,28 +2429,28 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h">

       <Filter>cores\dvdplayer\DVDInputStreams</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avcodec.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvCodec.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avformat.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvFormat.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\avio.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllPostProc.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\common.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllSwScale.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\decoder.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include\libavutil\avconfig.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllAvCodec.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avformat.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllAvFormat.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavutil\common.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\ffmpeg\DllPostProc.h">

+    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avio.h">

       <Filter>cores\dvdplayer\DVDHeaders</Filter>

     </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h">

@@ -2549,30 +2549,18 @@
     <ClInclude Include="..\..\xbmc\cores\paplayer\DllAdpcm.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllAdplug.h">

-      <Filter>cores\paplayer</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllASAP.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllDCACodec.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllDumb.h">

-      <Filter>cores\paplayer</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllGensApu.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllLibFlac.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllLibshnplay.h">

-      <Filter>cores\paplayer</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllMACDll.h">

-      <Filter>cores\paplayer</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\DllNosefart.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

@@ -2633,9 +2621,6 @@
     <ClInclude Include="..\..\xbmc\cores\paplayer\ReplayGain.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\cores\paplayer\RingHoldBuffer.h">

-      <Filter>cores\paplayer</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\xbmc\cores\paplayer\SIDCodec.h">

       <Filter>cores\paplayer</Filter>

     </ClInclude>