Merge pull request #3614 from elupus/audio_clean

DVDPlayerAudio cleanup

diff --combined XBMC.xcodeproj/project.pbxproj
index 1ff209d,e90dc89..cfe592a
--- 1/XBMC.xcodeproj/project.pbxproj
--- 2/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@@ -445,8 -445,6 +445,8 @@@
                DF64FE3E16C07AAA00D028FB /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE3716C07AAA00D028FB /* GUIViewState.cpp */; };
                DF64FE4016C07AAA00D028FB /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE3A16C07AAA00D028FB /* ViewDatabase.cpp */; };
                DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
 +              DF6D1DFE18312525009DB64F /* OverlayRendererGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55D3604C1826CAB900DA66D2 /* OverlayRendererGUI.cpp */; };
 +              DF6D1DFF18312525009DB64F /* OverlayRendererGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55D3604C1826CAB900DA66D2 /* OverlayRendererGUI.cpp */; };
                DF830D0C15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D0A15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp */; };
                DF830D1215BB262700602BE6 /* GUIKeyboardFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D0F15BB262700602BE6 /* GUIKeyboardFactory.cpp */; };
                DF89901C1709BB2D00B35C21 /* MediaSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8990161709BB2D00B35C21 /* MediaSettings.cpp */; };
@@@ -848,7 -846,6 +848,6 @@@
                DFF0F19317528350002DA3A4 /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
                DFF0F19417528350002DA3A4 /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
                DFF0F19517528350002DA3A4 /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
-               DFF0F19617528350002DA3A4 /* DVDPerformanceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */; };
                DFF0F19717528350002DA3A4 /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
                DFF0F19817528350002DA3A4 /* DVDPlayerAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */; };
                DFF0F19917528350002DA3A4 /* DVDPlayerSubtitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15880D25F9FA00618676 /* DVDPlayerSubtitle.cpp */; };
@@@ -1678,7 -1675,6 +1677,6 @@@
                E38E1FA30D25F9FD00618676 /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
                E38E1FA40D25F9FD00618676 /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
                E38E1FA50D25F9FD00618676 /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
-               E38E1FA60D25F9FD00618676 /* DVDPerformanceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */; };
                E38E1FA70D25F9FD00618676 /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
                E38E1FA80D25F9FD00618676 /* DVDPlayerAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */; };
                E38E1FA90D25F9FD00618676 /* DVDPlayerSubtitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15880D25F9FA00618676 /* DVDPlayerSubtitle.cpp */; };
@@@ -2274,7 -2270,6 +2272,6 @@@
                E49911FB174E5D4500741B6D /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; };
                E49911FC174E5D4500741B6D /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; };
                E49911FD174E5D4500741B6D /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; };
-               E49911FE174E5D4500741B6D /* DVDPerformanceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */; };
                E49911FF174E5D4500741B6D /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; };
                E4991200174E5D4500741B6D /* DVDPlayerAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */; };
                E4991201174E5D4500741B6D /* DVDPlayerSubtitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15880D25F9FA00618676 /* DVDPlayerSubtitle.cpp */; };
@@@ -4507,8 -4502,6 +4504,6 @@@
                E38E157F0D25F9FA00618676 /* DVDOverlayContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayContainer.h; sourceTree = "<group>"; };
                E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayRenderer.cpp; sourceTree = "<group>"; };
                E38E15810D25F9FA00618676 /* DVDOverlayRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayRenderer.h; sourceTree = "<group>"; };
-               E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDPerformanceCounter.cpp; sourceTree = "<group>"; };
-               E38E15830D25F9FA00618676 /* DVDPerformanceCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDPerformanceCounter.h; sourceTree = "<group>"; };
                E38E15840D25F9FA00618676 /* DVDPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDPlayer.cpp; sourceTree = "<group>"; };
                E38E15850D25F9FA00618676 /* DVDPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDPlayer.h; sourceTree = "<group>"; };
                E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDPlayerAudio.cpp; sourceTree = "<group>"; };
@@@ -7443,8 -7436,6 +7438,6 @@@
                                E38E157F0D25F9FA00618676 /* DVDOverlayContainer.h */,
                                E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */,
                                E38E15810D25F9FA00618676 /* DVDOverlayRenderer.h */,
-                               E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */,
-                               E38E15830D25F9FA00618676 /* DVDPerformanceCounter.h */,
                                E38E15840D25F9FA00618676 /* DVDPlayer.cpp */,
                                E38E15850D25F9FA00618676 /* DVDPlayer.h */,
                                E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */,
@@@ -9708,7 -9699,6 +9701,6 @@@
                                E38E1FA30D25F9FD00618676 /* DVDMessageTracker.cpp in Sources */,
                                E38E1FA40D25F9FD00618676 /* DVDOverlayContainer.cpp in Sources */,
                                E38E1FA50D25F9FD00618676 /* DVDOverlayRenderer.cpp in Sources */,
-                               E38E1FA60D25F9FD00618676 /* DVDPerformanceCounter.cpp in Sources */,
                                E38E1FA70D25F9FD00618676 /* DVDPlayer.cpp in Sources */,
                                E38E1FA80D25F9FD00618676 /* DVDPlayerAudio.cpp in Sources */,
                                E38E1FA90D25F9FD00618676 /* DVDPlayerSubtitle.cpp in Sources */,
@@@ -10943,7 -10933,6 +10935,6 @@@
                                DFF0F19317528350002DA3A4 /* DVDMessageTracker.cpp in Sources */,
                                DFF0F19417528350002DA3A4 /* DVDOverlayContainer.cpp in Sources */,
                                DFF0F19517528350002DA3A4 /* DVDOverlayRenderer.cpp in Sources */,
-                               DFF0F19617528350002DA3A4 /* DVDPerformanceCounter.cpp in Sources */,
                                DFF0F19717528350002DA3A4 /* DVDPlayer.cpp in Sources */,
                                DFF0F19817528350002DA3A4 /* DVDPlayerAudio.cpp in Sources */,
                                DFF0F19917528350002DA3A4 /* DVDPlayerSubtitle.cpp in Sources */,
@@@ -11720,7 -11709,6 +11711,7 @@@
                                DFEF0BC3180ADEDA00AEAED1 /* SmartPlaylistFileItemListModifier.cpp in Sources */,
                                7C2612691820667C0086E04D /* ISettingControl.cpp in Sources */,
                                7CC82C9518284F9F0010DF30 /* CharsetDetection.cpp in Sources */,
 +                              DF6D1DFF18312525009DB64F /* OverlayRendererGUI.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@@ -11987,7 -11975,6 +11978,6 @@@
                                E49911FB174E5D4500741B6D /* DVDMessageTracker.cpp in Sources */,
                                E49911FC174E5D4500741B6D /* DVDOverlayContainer.cpp in Sources */,
                                E49911FD174E5D4500741B6D /* DVDOverlayRenderer.cpp in Sources */,
-                               E49911FE174E5D4500741B6D /* DVDPerformanceCounter.cpp in Sources */,
                                E49911FF174E5D4500741B6D /* DVDPlayer.cpp in Sources */,
                                E4991200174E5D4500741B6D /* DVDPlayerAudio.cpp in Sources */,
                                E4991201174E5D4500741B6D /* DVDPlayerSubtitle.cpp in Sources */,
@@@ -12759,7 -12746,6 +12749,7 @@@
                                DFEF0BC2180ADEDA00AEAED1 /* SmartPlaylistFileItemListModifier.cpp in Sources */,
                                7C2612681820667C0086E04D /* ISettingControl.cpp in Sources */,
                                7CC82C9418284F9F0010DF30 /* CharsetDetection.cpp in Sources */,
 +                              DF6D1DFE18312525009DB64F /* OverlayRendererGUI.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --combined project/VS2010Express/XBMC.vcxproj
index 8227280,3c073f9..9c5dddf
--- 1/project/VS2010Express/XBMC.vcxproj
--- 2/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@@ -31,7 -31,6 +31,7 @@@
      <RootNamespace>XBMC_PC</RootNamespace>
      <Keyword>Win32Proj</Keyword>
    </PropertyGroup>
 +  <Import Project="$(SolutionDir)\XBMC.core-defaults.props" />
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
@@@ -60,42 -59,52 +60,42 @@@
      <UseDebugLibraries>false</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
 -  <PropertyGroup>
 -    <LocalDebuggerEnvironment>XBMC_HOME=$(SolutionDir)..\..&#xD;&#xA;PATH=$(SolutionDir)..\Win32BuildSetup\dependencies;%PATH%</LocalDebuggerEnvironment>
 -  </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -    <Import Project="XBMC for Windows.props" />
 +    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -    <Import Project="XBMC for Windows.props" />
 +    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -    <Import Project="XBMC for Windows.props" />
 +    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -    <Import Project="XBMC for Windows.props" />
 +    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -    <Import Project="XBMC for Windows.props" />
 +    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
    </ImportGroup>
    <PropertyGroup Label="UserMacros" />
    <PropertyGroup>
      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">XBMC\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">XBMC\$(Configuration)\objs\</IntDir>
 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">false</LinkIncremental>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">XBMC\$(Configuration)\</OutDir>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">XBMC\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">XBMC\$(Configuration)\objs\</IntDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">XBMC\$(Configuration)\objs\</IntDir>
 -    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">false</IgnoreImportLibrary>
 -    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">false</IgnoreImportLibrary>
 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">true</LinkIncremental>
 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</LinkIncremental>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">XBMC\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">XBMC\$(Configuration)\objs\</IntDir>
 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">false</LinkIncremental>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">XBMC\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">XBMC\$(Configuration)\objs\</IntDir>
 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">true</LinkIncremental>
      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
      <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
@@@ -113,27 -122,46 +113,27 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">
      <ClCompile>
        <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 -      <Optimization>Full</Optimization>
 -      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
 -      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <OmitFramePointers>true</OmitFramePointers>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;XMD_H;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <StringPooling>false</StringPooling>
 -      <MinimalRebuild>false</MinimalRebuild>
 +      <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;XMD_H;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <ExceptionHandling>Async</ExceptionHandling>
 -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 -      <BufferSecurityCheck>true</BufferSecurityCheck>
 -      <FunctionLevelLinking>false</FunctionLevelLinking>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
        <PrecompiledHeader>Use</PrecompiledHeader>
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 -      <WarningLevel>Level3</WarningLevel>
        <DebugInformationFormat>
        </DebugInformationFormat>
        <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 -      <ShowIncludes>false</ShowIncludes>
 -      <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <ObjectFileName>$(IntDir)\a\a\%(RelativeDir)</ObjectFileName>
      </ClCompile>
      <Link>
 -      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
 +      <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
        <AdditionalDependencies>DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)XBMC.exe</OutputFile>
        <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <DelayLoadDLLs>dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
 -      <SubSystem>Windows</SubSystem>
 -      <LargeAddressAware>true</LargeAddressAware>
 -      <OptimizeReferences>true</OptimizeReferences>
 -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <RandomizedBaseAddress>true</RandomizedBaseAddress>
        <DataExecutionPrevention>true</DataExecutionPrevention>
 -      <TargetMachine>MachineX86</TargetMachine>
 -      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
      </Link>
      <Manifest>
        <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@@ -142,28 -170,42 +142,28 @@@
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">
      <ClCompile>
 -      <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <MinimalRebuild>false</MinimalRebuild>
 +      <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <ExceptionHandling>Async</ExceptionHandling>
 -      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 -      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 -      <BufferSecurityCheck>true</BufferSecurityCheck>
        <PrecompiledHeader>Use</PrecompiledHeader>
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 -      <WarningLevel>Level3</WarningLevel>
 -      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
        <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 -      <ShowIncludes>false</ShowIncludes>
 -      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
        <ObjectFileName>$(IntDir)\a\a\%(RelativeDir)</ObjectFileName>
      </ClCompile>
      <Link>
 -      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
 +      <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
        <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)XBMC.exe</OutputFile>
        <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <ModuleDefinitionFile>
        </ModuleDefinitionFile>
        <DelayLoadDLLs>dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
        <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
 -      <SubSystem>Windows</SubSystem>
 -      <LargeAddressAware>true</LargeAddressAware>
        <EntryPointSymbol>
        </EntryPointSymbol>
        <RandomizedBaseAddress>true</RandomizedBaseAddress>
        <DataExecutionPrevention>true</DataExecutionPrevention>
 -      <TargetMachine>MachineX86</TargetMachine>
      </Link>
      <Manifest>
        <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@@ -172,17 -214,27 +172,17 @@@
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">
      <ClCompile>
 -      <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\lib\gtest\include;..\..\xbmc\cores\AudioEngine\;..\..\xbmc\cores\AudioEngine\Utils\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <MinimalRebuild>false</MinimalRebuild>
 +      <PreprocessorDefinitions>_CONSOLE;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <ExceptionHandling>Async</ExceptionHandling>
 -      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 -      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 -      <BufferSecurityCheck>true</BufferSecurityCheck>
        <PrecompiledHeader>Use</PrecompiledHeader>
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 -      <WarningLevel>Level3</WarningLevel>
 -      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
        <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 -      <ShowIncludes>false</ShowIncludes>
 -      <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <ObjectFileName>$(IntDir)\a\a\%(RelativeDir)</ObjectFileName>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
      </ClCompile>
      <Link>
 -      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
 +      <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
        <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;strmiids.lib;dxguid.lib;mfuuid.lib;comctl32.lib;yajl.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)xbmc-test.exe</OutputFile>
        <AdditionalLibraryDirectories>
@@@ -191,12 -243,15 +191,12 @@@
        <ModuleDefinitionFile>
        </ModuleDefinitionFile>
        <DelayLoadDLLs>dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
        <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
        <SubSystem>Console</SubSystem>
 -      <LargeAddressAware>true</LargeAddressAware>
        <EntryPointSymbol>
        </EntryPointSymbol>
        <RandomizedBaseAddress>true</RandomizedBaseAddress>
        <DataExecutionPrevention>true</DataExecutionPrevention>
 -      <TargetMachine>MachineX86</TargetMachine>
      </Link>
      <Manifest>
        <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@@ -206,25 -261,47 +206,25 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">
      <ClCompile>
        <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 -      <Optimization>Full</Optimization>
 -      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 -      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <OmitFramePointers>true</OmitFramePointers>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <StringPooling>false</StringPooling>
 -      <MinimalRebuild>false</MinimalRebuild>
 +      <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <ExceptionHandling>Async</ExceptionHandling>
 -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 -      <BufferSecurityCheck>true</BufferSecurityCheck>
 -      <FunctionLevelLinking>true</FunctionLevelLinking>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
        <PrecompiledHeader>Use</PrecompiledHeader>
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 -      <WarningLevel>Level3</WarningLevel>
 -      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
        <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 -      <ShowIncludes>false</ShowIncludes>
 -      <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <ObjectFileName>$(IntDir)\a\a\%(RelativeDir)</ObjectFileName>
 -      <IntrinsicFunctions>true</IntrinsicFunctions>
 -      <WholeProgramOptimization>true</WholeProgramOptimization>
      </ClCompile>
      <Link>
 -      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
 +      <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
        <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)XBMC.exe</OutputFile>
        <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <DelayLoadDLLs>dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
 -      <SubSystem>Windows</SubSystem>
 -      <LargeAddressAware>true</LargeAddressAware>
 -      <OptimizeReferences>true</OptimizeReferences>
 -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 -      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
        <RandomizedBaseAddress>true</RandomizedBaseAddress>
        <DataExecutionPrevention>true</DataExecutionPrevention>
 -      <TargetMachine>MachineX86</TargetMachine>
      </Link>
      <Manifest>
        <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@@ -233,28 -310,41 +233,28 @@@
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">
      <ClCompile>
 -      <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0600;NTDDI_VERSION=0x06000000;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <MinimalRebuild>false</MinimalRebuild>
 +      <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <ExceptionHandling>Async</ExceptionHandling>
 -      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 -      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
        <PrecompiledHeader>Use</PrecompiledHeader>
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 -      <WarningLevel>Level3</WarningLevel>
 -      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
        <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 -      <ShowIncludes>false</ShowIncludes>
 -      <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <ObjectFileName>$(IntDir)\a\a\%(RelativeDir)</ObjectFileName>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
      </ClCompile>
      <Link>
 -      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
 +      <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
        <AdditionalDependencies>DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)XBMC.exe</OutputFile>
        <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <ModuleDefinitionFile>
        </ModuleDefinitionFile>
        <DelayLoadDLLs>dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
        <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
 -      <SubSystem>Windows</SubSystem>
 -      <LargeAddressAware>true</LargeAddressAware>
        <EntryPointSymbol>
        </EntryPointSymbol>
        <RandomizedBaseAddress>true</RandomizedBaseAddress>
        <DataExecutionPrevention>true</DataExecutionPrevention>
 -      <TargetMachine>MachineX86</TargetMachine>
      </Link>
      <Manifest>
        <AdditionalManifestFiles>VC90.CRT.x86.manifest;win81.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@@ -264,6 -354,7 +264,6 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
      <ClCompile>
        <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
      </ClCompile>
    </ItemDefinitionGroup>
    <ItemGroup>
@@@ -1714,7 -1805,6 +1714,6 @@@
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.cpp" />
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp" />
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp" />
-     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPerformanceCounter.cpp" />
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp" />
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.cpp" />
      <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.cpp" />
@@@ -2496,7 -2586,6 +2495,6 @@@
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageTracker.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h" />
-     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPerformanceCounter.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.h" />

diff --combined xbmc/cores/dvdplayer/DVDPlayer.cpp
index bf36e1d,b92582c..32c5abf
--- 1/xbmc/cores/dvdplayer/DVDPlayer.cpp
--- 2/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@@ -49,7 -49,6 +49,6 @@@
  #include "guilib/StereoscopicsManager.h"
  #include "Application.h"
  #include "ApplicationMessenger.h"
- #include "DVDPerformanceCounter.h"
  #include "filesystem/File.h"
  #include "pictures/Picture.h"
  #include "DllSwScale.h"
@@@ -500,8 -499,7 +499,8 @@@ CDVDPlayer::CDVDPlayer(IPlayerCallback
        m_dvdPlayerAudio(&m_clock, m_messenger),
        m_dvdPlayerSubtitle(&m_overlayContainer),
        m_dvdPlayerTeletext(),
 -      m_ready(true)
 +      m_ready(true),
 +      m_DemuxerPausePending(false)
  {
    m_pDemuxer = NULL;
    m_pSubtitleDemuxer = NULL;
@@@ -642,7 -640,6 +641,6 @@@ void CDVDPlayer::OnStartup(
  
    m_messenger.Init();
  
-   g_dvdPerformanceCounter.EnableMainPerformance(this);
    CUtil::ClearTempFonts();
  }
  
@@@ -1201,12 -1198,6 +1199,12 @@@ void CDVDPlayer::Process(
      if ((!m_dvdPlayerAudio.AcceptsData() && m_CurrentAudio.id >= 0) ||
          (!m_dvdPlayerVideo.AcceptsData() && m_CurrentVideo.id >= 0))
      {
 +      if(m_pDemuxer && m_DemuxerPausePending)
 +      {
 +        m_DemuxerPausePending = false;
 +        m_pDemuxer->SetSpeed(DVD_PLAYSPEED_PAUSE);
 +      }
 +
        Sleep(10);
        continue;
      }
@@@ -2039,8 -2030,6 +2037,6 @@@ void CDVDPlayer::SendPlayerMessage(CDVD
  
  void CDVDPlayer::OnExit()
  {
-   g_dvdPerformanceCounter.DisableMainPerformance();
- 
    try
    {
      CLog::Log(LOGNOTICE, "CDVDPlayer::OnExit()");
@@@ -2338,14 -2327,10 +2334,14 @@@ void CDVDPlayer::HandleMessages(
          m_dvdPlayerAudio.SetSpeed(speed);
          m_dvdPlayerVideo.SetSpeed(speed);
  
 -        // TODO - we really shouldn't pause demuxer
 -        //        until our buffers are somewhat filled
 +        // We can't pause demuxer until our buffers are full. Doing so will result in continued
 +        // calls to Read() which may then block indefinitely (CDVDInputStreamRTMP for example).
          if(m_pDemuxer)
 -          m_pDemuxer->SetSpeed(speed);
 +        {
 +          m_DemuxerPausePending = (speed == DVD_PLAYSPEED_PAUSE);
 +          if (!m_DemuxerPausePending)
 +            m_pDemuxer->SetSpeed(speed);
 +        }
        }
        else if (pMsg->IsType(CDVDMsg::PLAYER_CHANNEL_SELECT_NUMBER) && m_messenger.GetPacketCount(CDVDMsg::PLAYER_CHANNEL_SELECT_NUMBER) == 0)
        {