Migrate build environment to MSVC 2010.

Synchronize build environment.

4 files changed, 263 insertions, 315 deletions

diff --git a/pianobar/pianobar.vcproj b/pianobar/pianobar.vcproj
deleted file mode 100644
index 89008e5..0000000
--- a/pianobar/pianobar.vcproj
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="pianobar"

-	ProjectGUID="{D3B44180-848B-4A1F-9176-9891A87876BF}"

-	RootNamespace="pianobar"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)build\"

-			IntermediateDirectory="$(SolutionDir)build\temp\obj\$(ProjectName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(SolutionDir)compatibility\&quot;;&quot;$(SolutionDir)build\temp\include\&quot;;&quot;$(ProjectDir)src\src\libezxml\&quot;;&quot;$(ProjectDir)src\src\libwaitress\&quot;;&quot;$(ProjectDir)src\src\libpiano\&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				MinimalRebuild="false"

-				ExceptionHandling="0"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"

-				WarningLevel="3"

-				DebugInformationFormat="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib ws2_32.lib"

-				OutputFile="$(OutDir)\$(ProjectName)-debug.exe"

-				AdditionalLibraryDirectories="$(SolutionDir)build\temp\lib\"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine=""

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)build\"

-			IntermediateDirectory="$(SolutionDir)build\temp\obj\$(ProjectName)\$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="&quot;$(SolutionDir)compatibility\&quot;;&quot;$(SolutionDir)build\temp\include\&quot;;&quot;$(ProjectDir)src\src\libezxml\&quot;;&quot;$(ProjectDir)src\src\libwaitress\&quot;;&quot;$(ProjectDir)src\src\libpiano\&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"

-				WarningLevel="3"

-				DebugInformationFormat="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_UNICODE;UNICODE;NDEBUG"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib ws2_32.lib"

-				AdditionalLibraryDirectories="$(SolutionDir)build\temp\lib\"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine=""

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="resources"

-			>

-			<File

-				RelativePath=".\src\src\pianobar.ico"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\pianobar.rc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libwaitress"

-			>

-			<File

-				RelativePath=".\src\src\libwaitress\config.h"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libwaitress\waitress.c"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libwaitress\waitress.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libpiano"

-			>

-			<File

-				RelativePath=".\src\src\libpiano\config.h"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\crypt.c"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\crypt.h"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\piano.c"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\piano.h"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\piano_private.h"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\request.c"

-				>

-			</File>

-			<File

-				RelativePath=".\src\src\libpiano\response.c"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath=".\src\src\config.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\main.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\main.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\player.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\player.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\settings.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\settings.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\terminal.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\terminal.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_act.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_act.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_dispatch.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_dispatch.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_readline.c"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_readline.h"

-			>

-		</File>

-		<File

-			RelativePath=".\src\src\ui_types.h"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pianobar/pianobar.vcxproj b/pianobar/pianobar.vcxproj
new file mode 100644
index 0000000..4a45081
--- /dev/null
+++ b/pianobar/pianobar.vcxproj
@@ -0,0 +1,184 @@
+<?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>{D3B44180-848B-4A1F-9176-9891A87876BF}</ProjectGuid>
+    <RootNamespace>pianobar</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\temp\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-debug</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\libwaitress\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)build\temp\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\libwaitress\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)build\temp\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="src\src\pianobar.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\src\pianobar.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\src\libwaitress\config.h" />
+    <ClInclude Include="src\src\libwaitress\waitress.h" />
+    <ClInclude Include="src\src\libpiano\config.h" />
+    <ClInclude Include="src\src\libpiano\crypt.h" />
+    <ClInclude Include="src\src\libpiano\piano.h" />
+    <ClInclude Include="src\src\libpiano\piano_private.h" />
+    <ClInclude Include="src\src\config.h" />
+    <ClInclude Include="src\src\main.h" />
+    <ClInclude Include="src\src\player.h" />
+    <ClInclude Include="src\src\settings.h" />
+    <ClInclude Include="src\src\terminal.h" />
+    <ClInclude Include="src\src\ui.h" />
+    <ClInclude Include="src\src\ui_act.h" />
+    <ClInclude Include="src\src\ui_dispatch.h" />
+    <ClInclude Include="src\src\ui_readline.h" />
+    <ClInclude Include="src\src\ui_types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\src\libwaitress\waitress.c" />
+    <ClCompile Include="src\src\libpiano\crypt.c" />
+    <ClCompile Include="src\src\libpiano\piano.c" />
+    <ClCompile Include="src\src\libpiano\request.c" />
+    <ClCompile Include="src\src\libpiano\response.c" />
+    <ClCompile Include="src\src\main.c" />
+    <ClCompile Include="src\src\player.c" />
+    <ClCompile Include="src\src\settings.c" />
+    <ClCompile Include="src\src\terminal.c" />
+    <ClCompile Include="src\src\ui.c" />
+    <ClCompile Include="src\src\ui_act.c" />
+    <ClCompile Include="src\src\ui_dispatch.c" />
+    <ClCompile Include="src\src\ui_readline.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\blowfish\blowfish.vcxproj">
+      <Project>{f0b7d905-bd81-4998-8386-333389be15de}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\faad2\faad2.vcxproj">
+      <Project>{8f4036c9-0bd5-4373-b59e-e75e8ab72398}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\json-c\json-c.vcxproj">
+      <Project>{65ab4e50-81ef-4bc4-bba4-8ec4315ada3f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libao\libao.vcxproj">
+      <Project>{75e224e3-6a99-4c8f-9598-9a6f115b91f2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libmad\libmad.vcxproj">
+      <Project>{7ddfb46b-0754-450d-9a7a-4b982e40367d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\polarssl\polarssl.vcxproj">
+      <Project>{4f001038-5dd8-4e07-a6de-4d0dd4a6df60}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\pthreads\pthread-win32.vcxproj">
+      <Project>{ce4cd8f8-e5ab-46f6-acf3-167687c47c9f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/pianobar/pianobar.vcxproj.filters b/pianobar/pianobar.vcxproj.filters
new file mode 100644
index 0000000..767a164
--- /dev/null
+++ b/pianobar/pianobar.vcxproj.filters
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="resources">
+      <UniqueIdentifier>{5475b56a-9449-44f5-9eda-68707e1acf17}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libwaitress">
+      <UniqueIdentifier>{a1858c56-3822-4fcb-93b0-f2da2a4641b1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libpiano">
+      <UniqueIdentifier>{d2ddb405-1e28-4f88-a72c-2a31aad44d09}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\src\pianobar.ico">
+      <Filter>resources</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\src\pianobar.rc">
+      <Filter>resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\src\libwaitress\config.h">
+      <Filter>libwaitress</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\libwaitress\waitress.h">
+      <Filter>libwaitress</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\libpiano\config.h">
+      <Filter>libpiano</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\libpiano\crypt.h">
+      <Filter>libpiano</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\libpiano\piano.h">
+      <Filter>libpiano</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\libpiano\piano_private.h">
+      <Filter>libpiano</Filter>
+    </ClInclude>
+    <ClInclude Include="src\src\config.h" />
+    <ClInclude Include="src\src\main.h" />
+    <ClInclude Include="src\src\player.h" />
+    <ClInclude Include="src\src\settings.h" />
+    <ClInclude Include="src\src\terminal.h" />
+    <ClInclude Include="src\src\ui.h" />
+    <ClInclude Include="src\src\ui_act.h" />
+    <ClInclude Include="src\src\ui_dispatch.h" />
+    <ClInclude Include="src\src\ui_readline.h" />
+    <ClInclude Include="src\src\ui_types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\src\libwaitress\waitress.c">
+      <Filter>libwaitress</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\libpiano\crypt.c">
+      <Filter>libpiano</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\libpiano\piano.c">
+      <Filter>libpiano</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\libpiano\request.c">
+      <Filter>libpiano</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\libpiano\response.c">
+      <Filter>libpiano</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\main.c" />
+    <ClCompile Include="src\src\player.c" />
+    <ClCompile Include="src\src\settings.c" />
+    <ClCompile Include="src\src\terminal.c" />
+    <ClCompile Include="src\src\ui.c" />
+    <ClCompile Include="src\src\ui_act.c" />
+    <ClCompile Include="src\src\ui_dispatch.c" />
+    <ClCompile Include="src\src\ui_readline.c" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/pianobar/src b/pianobar/src
-Subproject c0060d2d2ecc076ec50ffd81f25259a5161f444
+Subproject e7649b8e9f000b17e069e515065161f3af9ab68