Skip to content

Commit

Permalink
Make NowPlaying a measure
Browse files Browse the repository at this point in the history
  • Loading branch information
@poiru
poiru committed Dec 26, 2015
1 parent 1f8b3e0 commit 6a61727
Show file tree
Hide file tree
Showing 219 changed files with 877 additions and 831 deletions.
2 changes: 1 addition & 1 deletion Build/Installer/Installer.nsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ FunctionEnd

Function HandlePlugins
${If} $R7 == "MediaKey.dll"
${OrIf} $R7 == "NowPlaying.dll"
${OrIf} $R7 == "WebParser.dll"
Delete "$R9"
${ElseIf} $R7 != "AdvancedCPU.dll"
Expand All @@ -777,7 +778,6 @@ Function HandlePlugins
${AndIf} $R7 != "FolderInfo.dll"
${AndIf} $R7 != "InputText.dll"
${AndIf} $R7 != "iTunesPlugin.dll"
${AndIf} $R7 != "NowPlaying.dll"
${AndIf} $R7 != "PerfMon.dll"
${AndIf} $R7 != "PingPlugin.dll"
${AndIf} $R7 != "PowerPlugin.dll"
Expand Down
60 changes: 57 additions & 3 deletions Library/Library.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>.\;lua/include;lua/lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;lua/include;lua/lua;.\NowPlaying\SDKs;./taglib;./taglib/toolkit;./taglib/asf;./taglib/mpeg;./taglib/ogg;./taglib/ogg/flac;./taglib/flac;./taglib/mpc;./taglib/ogg/vorbis;./taglib/mpeg/id3v2;./taglib/mpeg/id3v2/frames;./taglib/mpeg/id3v1;./taglib/ape;./taglib/wavpack;./taglib/mp4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_USRDLL;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;Imagehlp.lib;Urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;Imagehlp.dll;Urlmon.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
<AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;Imagehlp.lib;Urlmon.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;Imagehlp.dll;Urlmon.dll;psapi.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
<ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
Expand All @@ -50,6 +50,7 @@
<ClCompile Include="MeasureNetIn.cpp" />
<ClCompile Include="MeasureNetOut.cpp" />
<ClCompile Include="MeasureNetTotal.cpp" />
<ClCompile Include="MeasureNowPlaying.cpp" />
<ClCompile Include="MeasurePhysicalMemory.cpp" />
<ClCompile Include="MeasurePlugin.cpp" />
<ClCompile Include="MeasureRegistry.cpp" />
Expand All @@ -70,6 +71,20 @@
<ClCompile Include="MeterRoundLine.cpp" />
<ClCompile Include="MeterString.cpp" />
<ClCompile Include="Mouse.cpp" />
<ClCompile Include="NowPlaying\Cover.cpp" />
<ClCompile Include="NowPlaying\Internet.cpp" />
<ClCompile Include="NowPlaying\Lyrics.cpp" />
<ClCompile Include="NowPlaying\Player.cpp" />
<ClCompile Include="NowPlaying\PlayerAIMP.cpp" />
<ClCompile Include="NowPlaying\PlayerCAD.cpp" />
<ClCompile Include="NowPlaying\PlayerITunes.cpp" />
<ClCompile Include="NowPlaying\PlayerSpotify.cpp" />
<ClCompile Include="NowPlaying\PlayerWinamp.cpp" />
<ClCompile Include="NowPlaying\PlayerWLM.cpp" />
<ClCompile Include="NowPlaying\PlayerWMP.cpp" />
<ClCompile Include="NowPlaying\SDKs\iTunes\iTunesCOMInterface_i.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Rainmeter.cpp" />
<ClCompile Include="Skin.cpp" />
<ClCompile Include="Export.cpp" />
Expand All @@ -92,6 +107,33 @@
<ClCompile Include="lua\glue\LuaMeter.cpp" />
<ClCompile Include="lua\glue\LuaMeterWindow.cpp" />
<ClCompile Include="lua\glue\LuaGlobal.cpp" />
<ClCompile Include="taglib\TagLibUnity.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_ape.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_asf.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_flac.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mp4.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mpeg.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mpeg_id3v2.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_ogg.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_toolkit.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Library.rc" />
Expand All @@ -117,6 +159,7 @@
<ClInclude Include="MeasureNetIn.h" />
<ClInclude Include="MeasureNetOut.h" />
<ClInclude Include="MeasureNetTotal.h" />
<ClInclude Include="MeasureNowPlaying.h" />
<ClInclude Include="MeasurePhysicalMemory.h" />
<ClInclude Include="MeasurePlugin.h" />
<ClInclude Include="MeasureRegistry.h" />
Expand All @@ -137,6 +180,17 @@
<ClInclude Include="MeterRoundLine.h" />
<ClInclude Include="MeterString.h" />
<ClInclude Include="Mouse.h" />
<ClInclude Include="NowPlaying\Cover.h" />
<ClInclude Include="NowPlaying\Internet.h" />
<ClInclude Include="NowPlaying\Lyrics.h" />
<ClInclude Include="NowPlaying\Player.h" />
<ClInclude Include="NowPlaying\PlayerAIMP.h" />
<ClInclude Include="NowPlaying\PlayerCAD.h" />
<ClInclude Include="NowPlaying\PlayerITunes.h" />
<ClInclude Include="NowPlaying\PlayerSpotify.h" />
<ClInclude Include="NowPlaying\PlayerWinamp.h" />
<ClInclude Include="NowPlaying\PlayerWLM.h" />
<ClInclude Include="NowPlaying\PlayerWMP.h" />
<ClInclude Include="Rainmeter.h" />
<ClInclude Include="Skin.h" />
<ClInclude Include="Export.h" />
Expand Down
114 changes: 114 additions & 0 deletions Library/Library.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
<Filter Include="Lua\glue">
<UniqueIdentifier>{941dce28-a314-4492-befb-5770432c98bf}</UniqueIdentifier>
</Filter>
<Filter Include="NowPlaying">
<UniqueIdentifier>{64424fee-4da8-4109-84de-df55a55e63c0}</UniqueIdentifier>
</Filter>
<Filter Include="taglib">
<UniqueIdentifier>{fe354ece-06ea-4af8-9129-f0fcb7e31d0c}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ConfigParser.cpp">
Expand Down Expand Up @@ -195,6 +201,72 @@
<ClCompile Include="MeasureString.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerAIMP.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerCAD.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerITunes.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerSpotify.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerWinamp.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerWLM.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\PlayerWMP.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\Cover.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\Internet.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\Lyrics.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\Player.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_toolkit.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_ape.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_asf.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_flac.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mp4.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mpeg.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_mpeg_id3v2.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="taglib\TagLibUnity_ogg.cpp">
<Filter>taglib</Filter>
</ClCompile>
<ClCompile Include="NowPlaying\SDKs\iTunes\iTunesCOMInterface_i.c">
<Filter>NowPlaying</Filter>
</ClCompile>
<ClCompile Include="MeasureNowPlaying.cpp">
<Filter>NowPlaying</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ConfigParser.h">
Expand Down Expand Up @@ -356,6 +428,48 @@
<ClInclude Include="MeasureString.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MeasureMediaKey.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MeasureWebParser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\Player.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerAIMP.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerCAD.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerITunes.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerSpotify.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerWinamp.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerWLM.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\PlayerWMP.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\Cover.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\Internet.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="NowPlaying\Lyrics.h">
<Filter>NowPlaying</Filter>
</ClInclude>
<ClInclude Include="MeasureNowPlaying.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Library.rc">
Expand Down
5 changes: 5 additions & 0 deletions Library/Measure.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "MeasureNetIn.h"
#include "MeasureNetOut.h"
#include "MeasureNetTotal.h"
#include "MeasureNowPlaying.h"
#include "MeasureDiskSpace.h"
#include "MeasureUptime.h"
#include "MeasurePlugin.h"
Expand Down Expand Up @@ -746,6 +747,10 @@ Measure* Measure::Create(const WCHAR* measure, Skin* skin, const WCHAR* name)
{
return new MeasureNetTotal(skin, name);
}
else if (_wcsicmp(L"NowPlaying", measure) == 0)
{
return new MeasureNowPlaying(skin, name);
}
else if (_wcsicmp(L"PhysicalMemory", measure) == 0)
{
return new MeasurePhysicalMemory(skin, name);
Expand Down
Loading

0 comments on commit 6a61727

Please sign in to comment.