Update to release 2015.12.05

2 files changed, 60 insertions, 16 deletions

diff --git a/pianobar/pianobar.vcxproj b/pianobar/pianobar.vcxproj
index 750a5f9..5a8ec75 100644
--- a/pianobar/pianobar.vcxproj
+++ b/pianobar/pianobar.vcxproj
@@ -54,8 +54,8 @@
   <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_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_DEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>$(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_HAS_EXCEPTIONS=0;_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>

@@ -89,8 +89,8 @@
     <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_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;NDEBUG;_CONSOLE;ENABLE_FAAD;ENABLE_MAD;PTW32_STATIC_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>$(SolutionDir)compatibility\;$(SolutionDir)build\temp\include\;$(ProjectDir)src\src\libezxml\;$(ProjectDir)src\src\;$(ProjectDir)src\src\libpiano\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x0501;WIN32;_HAS_EXCEPTIONS=0;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>

@@ -134,14 +134,16 @@
   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\src\console.c" />

-    <ClCompile Include="src\src\http.c" />

+    <ClCompile Include="src\src\http\http.c" />

     <ClCompile Include="src\src\libpiano\crypt.c" />

     <ClCompile Include="src\src\libpiano\list.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\player2.c" />

+    <ClCompile Include="src\src\player\backends\direct_show.c" />

+    <ClCompile Include="src\src\player\backends\media_foundation.cpp" />

+    <ClCompile Include="src\src\player\player2.c" />

     <ClCompile Include="src\src\settings.c" />

     <ClCompile Include="src\src\ui.c" />

     <ClCompile Include="src\src\ui_act.c" />

@@ -151,12 +153,16 @@
   <ItemGroup>

     <ClInclude Include="src\src\config.h" />

     <ClInclude Include="src\src\console.h" />

-    <ClInclude Include="src\src\http.h" />

+    <ClInclude Include="src\src\http\http.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\main.h" />

-    <ClInclude Include="src\src\player2.h" />

+    <ClInclude Include="src\src\player\backends\media_foundation.h" />

+    <ClInclude Include="src\src\player\backends\utility\com_ptr.h" />

+    <ClInclude Include="src\src\player\backends\utility\optional.h" />

+    <ClInclude Include="src\src\player\player2.h" />

+    <ClInclude Include="src\src\player\player2_private.h" />

     <ClInclude Include="src\src\settings.h" />

     <ClInclude Include="src\src\ui.h" />

     <ClInclude Include="src\src\ui_act.h" />

diff --git a/pianobar/pianobar.vcxproj.filters b/pianobar/pianobar.vcxproj.filters
index 191825e..ae0ac8e 100644
--- a/pianobar/pianobar.vcxproj.filters
+++ b/pianobar/pianobar.vcxproj.filters
@@ -7,6 +7,18 @@
     <Filter Include="libpiano">

       <UniqueIdentifier>{d2ddb405-1e28-4f88-a72c-2a31aad44d09}</UniqueIdentifier>

     </Filter>

+    <Filter Include="player">

+      <UniqueIdentifier>{5cebb794-aae7-4f96-a5d3-964ac9c32584}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="http">

+      <UniqueIdentifier>{a466ef7e-8f73-4e6b-bf14-29aa36864045}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="player\backends">

+      <UniqueIdentifier>{03cb0be3-c1ba-4ee0-aee8-36cac4739567}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="player\backends\utility">

+      <UniqueIdentifier>{2b2ede7d-c8bc-4ddc-b5a9-681ce0f0dc64}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\src\main.c" />

@@ -31,8 +43,18 @@
       <Filter>libpiano</Filter>

     </ClCompile>

     <ClCompile Include="src\src\console.c" />

-    <ClCompile Include="src\src\player2.c" />

-    <ClCompile Include="src\src\http.c" />

+    <ClCompile Include="src\src\player\player2.c">

+      <Filter>player</Filter>

+    </ClCompile>

+    <ClCompile Include="src\src\http\http.c">

+      <Filter>http</Filter>

+    </ClCompile>

+    <ClCompile Include="src\src\player\backends\media_foundation.cpp">

+      <Filter>player\backends</Filter>

+    </ClCompile>

+    <ClCompile Include="src\src\player\backends\direct_show.c">

+      <Filter>player\backends</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\src\config.h" />

@@ -53,17 +75,33 @@
       <Filter>libpiano</Filter>

     </ClInclude>

     <ClInclude Include="src\src\console.h" />

-    <ClInclude Include="src\src\player2.h" />

-    <ClInclude Include="src\src\http.h" />

+    <ClInclude Include="src\src\player\player2.h">

+      <Filter>player</Filter>

+    </ClInclude>

+    <ClInclude Include="src\src\http\http.h">

+      <Filter>http</Filter>

+    </ClInclude>

+    <ClInclude Include="src\src\player\backends\media_foundation.h">

+      <Filter>player\backends</Filter>

+    </ClInclude>

+    <ClInclude Include="src\src\player\backends\utility\com_ptr.h">

+      <Filter>player\backends\utility</Filter>

+    </ClInclude>

+    <ClInclude Include="src\src\player\backends\utility\optional.h">

+      <Filter>player\backends\utility</Filter>

+    </ClInclude>

+    <ClInclude Include="src\src\player\player2_private.h">

+      <Filter>player</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <Image Include="resources\pianobar.ico">

+    <ResourceCompile Include="resources\pianobar.rc">

       <Filter>resources</Filter>

-    </Image>

+    </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resources\pianobar.rc">

+    <Image Include="resources\pianobar.ico">

       <Filter>resources</Filter>

-    </ResourceCompile>

+    </Image>

   </ItemGroup>

 </Project>
\ No newline at end of file