Merge experimental branch to master

Merge experimental branch to master

@Resources/include/MeasureBandsSmoothed.inc

@@ -1,6 +1,3 @@
-[Variables]
-@include=#@#variables.ini
-
 [MeasureAudioSmoothed0]
 Measure=Calc
 Formula=(MeasureAudioRaw0+MeasureAudioRaw0+MeasureAudioRaw1)/12+#MinBarValue#
@@ -404,4 +401,4 @@ AverageSize=#AverageSize#
 [MeasureAudioSmoothed100]
 Measure=Calc
 Formula=(MeasureAudioRaw99+MeasureAudioRaw100+MeasureAudioRaw100)/10+#MinBarValue#
-AverageSize=#AverageSize#
+AverageSize=#AverageSize#

@Resources/include/MeasureGPMDP.inc

@@ -1,7 +1,3 @@
-[Variables]
-; Includes the variables/styles used for the skin.
-@include=#@#variables.ini
-
 [MeasureState]
 Measure=Plugin
 Plugin=GPMDPPlugin
@@ -13,7 +9,7 @@ Measure=Plugin
 Plugin=GPMDPPlugin
 PlayerInfo=ConnectionStatus
 IfEqualValue=1
-IfEqualAction=[!ActivateConfig "#ROOTCONFIG#\Settings\auth"]
+IfEqualAction=[!ActivateConfig "#ROOTCONFIG#\Settings\misc\auth" "GPMDPAuth.ini"]
 UpdateDivider=100
 
 [MeasureStateButton]
@@ -74,4 +70,4 @@ IfEqualAction=[!HideFade][!HideFade "#ROOTCONFIG#\Song Information"]
 IfAboveValue=0
 IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
 Disabled=#DisableAutoHide#
-UpdateDivider=100
+UpdateDivider=100

@Resources/include/MeasureNowPlaying.inc

@@ -1,7 +1,3 @@
-[Variables]
-; Includes the variables/styles used for the skin.
-@include=#@#variables.ini
-
 [MeasureState]
 Measure=Plugin
 Plugin=NowPlaying
@@ -73,4 +69,4 @@ IfEqualAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
 IfAboveValue=1
 IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
 Disabled=#DisableAutoHide#
-UpdateDivider=100
+UpdateDivider=100

@Resources/include/MeasureRotate.inc

@@ -0,0 +1,81 @@
+[Width]
+Measure=Calc
+Formula=(((#BarGap#*#ScaleVisualizer#)+(#BarWidth#*#ScaleVisualizer#))*#BarCount#)+(5*#ScaleVisualizer#)
+
+[Height]
+Measure=Calc
+Formula=(#BarHeight#)
+
+[AbsSinWidth]
+Measure=Calc
+Formula=(Abs(Sin(#Angle#*PI/180)*Width))
+
+[AbsCosWidth]
+Measure=Calc
+Formula=(Abs(Cos(#Angle#*PI/180)*Width))
+
+[AbsSinHeight]
+Measure=Calc
+Formula=(Abs(Sin(#Angle#*PI/180)*Height))
+
+[AbsCosHeight]
+Measure=Calc
+Formula=(Abs(Cos(#Angle#*PI/180)*Height))
+
+; The pivot point is always the top-left corner of the first meter
+; The point of rotation (relative to the top-left corner of the skin window) is along the skin boundaries based on the angle
+[MoveX]
+Measure=Calc
+IfCondition=(((#Angle# > 0) && (#Angle# <= 45)) || ((#Angle# > 270) && (#Angle# <= 315)))
+IfTrueAction=[!SetOption MoveX Formula 0][!UpdateMeasure MoveX]
+IfCondition2=(((#Angle# > 45) && (#Angle# <= 90)) || ((#Angle# > 315) && (#Angle# < 360)))
+IfTrueAction2=[!SetOption MoveX Formula (AbsSinHeight)][!UpdateMeasure MoveX]
+IfCondition3=(((#Angle# > 90) && (#Angle# <= 135)) || ((#Angle# > 180) && (#Angle# <= 225)))
+IfTrueAction3=[!SetOption MoveX Formula (AbsSinHeight+AbsCosWidth)][!UpdateMeasure MoveX]
+IfCondition4=(((#Angle# > 135) && (#Angle# <= 180)) || ((#Angle# > 225) && (#Angle# <= 270)))
+IfTrueAction4=[!SetOption MoveX Formula (AbsCosWidth)][!UpdateMeasure MoveX]
+DynamicVariables=1
+
+[MoveY]
+Measure=Calc
+IfCondition=(((#Angle# > 0) && (#Angle# <= 45)) || ((#Angle# > 90) && (#Angle# <= 135)))
+IfTrueAction=[!SetOption MoveY Formula (AbsSinWidth)][!UpdateMeasure MoveY]
+IfCondition2=(((#Angle# > 45) && (#Angle# <= 90)) || ((#Angle# > 135) && (#Angle# <= 180)))
+IfTrueAction2=[!SetOption MoveY Formula (AbsSinWidth+AbsCosHeight)][!UpdateMeasure MoveY]
+IfCondition3=(((#Angle# > 180) && (#Angle# <= 225)) || ((#Angle# > 270) && (#Angle# <= 315)))
+IfTrueAction3=[!SetOption MoveY Formula (AbsCosHeight)][!UpdateMeasure MoveY]
+IfCondition4=(((#Angle# > 225) && (#Angle# <= 270)) || ((#Angle# > 315) && (#Angle# < 360)))
+IfTrueAction4=[!SetOption MoveY Formula 0][!UpdateMeasure MoveY]
+DynamicVariables=1
+
+; 0 = X-axis, 1 = Y-axis
+[NearestAxis]
+Measure=Calc
+Formula=((((#Angle# > 45) && (#Angle# <= 135)) || ((#Angle# > 225) && (#Angle# <= 315))) ? 1 : 0)
+IfCondition=NearestAxis = 1
+IfTrueAction=[!WriteKeyValue Variables NearestAxis "1" "#@#Variables.ini"]
+IfFalseAction=[!WriteKeyValue Variables NearestAxis "0" "#@#Variables.ini"]
+DynamicVariables=1
+
+; Only antialias and set the matrix when the angle has changed
+[CheckRotation]
+Measure=Calc
+Formula=(((#Angle# = 0) || (#Angle# = 360)) ? 0 : 1)
+
+; Adjust rotation angle based on orientation
+[Angle]
+Measure=Calc
+Formula=(NearestAxis = 0 ? #Angle# : (#Angle# + 90))
+
+[Matrix]
+Measure=String
+String="(Cos([Angle]*PI/180));(-Sin([Angle]*PI/180));(Sin([Angle]*PI/180));(Cos([Angle]*PI/180));[MoveX];[MoveY]"
+DynamicVariables=1
+OnUpdateAction=
+
+; Reveal the transformation by expanding the skin window through an invisible meter
+[BoundingBox]
+Meter=Image
+W=([AbsCosWidth]+[AbsSinHeight])
+H=([AbsSinWidth]+[AbsCosHeight])
+DynamicVariables=1

@Resources/include/MeasureSpotify.inc

@@ -1,7 +1,3 @@
-[Variables]
-; Includes the variables/styles used for the skin.
-@include=#@#variables.ini
-
 [MeasureState]
 Measure=Plugin
 Plugin=NowPlaying
@@ -61,12 +57,11 @@ UpdateDivider=10
 
 [MeasureAutoHideSpotify]
 Measure=Plugin
-Plugin=NowPlaying
-PlayerName=Spotify
-PlayerType=State
-IfEqualValue=0
+Plugin=Process
+ProcessName=Spotify.exe
+IfEqualValue=-1
 IfEqualAction=[!HideFade][!HideFade "#ROOTCONFIG#\Song Information"]
-IfAboveValue=0
+IfAboveValue=-1
 IfAboveAction=[!ShowFade][!ShowFade "#ROOTCONFIG#\Song Information"]
 Disabled=#DisableAutoHide#
-UpdateDivider=100
+UpdateDivider=100

@Resources/include/MeasureStyling.inc

@@ -12,11 +12,11 @@ UpdateDivider=-1
 Measure=Calc
 Formula=#EnableDynamicColors#
 IfBelowValue=1
-IfBelowAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleStaticBar"][!SetOption MeterCoverBG MeterStyle "StyleStaticMeter"][!SetOptionGroup SongMeta MeterStyle "StyleStaticText"][!DisableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
+IfBelowAction=[!SetOptionGroup GroupBars MeterStyle "StyleStaticBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleStaticBar"][!SetOption MeterCoverBG MeterStyle "StyleStaticMeter"][!SetOptionGroup SongMeta MeterStyle "StyleStaticText"][!DisableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
 IfEqualValue=1
-IfEqualAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleGenreBar"][!SetOption MeterCoverBG MeterStyle "StyleGenreMeter"][!SetOptionGroup SongMeta MeterStyle "StyleGenreText"][!EnableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
+IfEqualAction=[!SetOptionGroup GroupBars MeterStyle "StyleGenreBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleGenreBar"][!SetOption MeterCoverBG MeterStyle "StyleGenreMeter"][!SetOptionGroup SongMeta MeterStyle "StyleGenreText"][!EnableMeasure MeasureGenre][!DisableMeasure MeasureGetCoverColor][!DisableMeasure MeasureCoverColor]
 IfAboveValue=1
-IfAboveAction=[!SetOptionGroup GroupBarColor MeterStyle "StyleCoverBar"][!SetOption MeterCoverBG MeterStyle "StyleCoverMeter"][!SetOptionGroup SongMeta MeterStyle "StyleCoverText"][!DisableMeasure MeasureGenre][!EnableMeasure MeasureGetCoverColor][!EnableMeasure MeasureCoverColor]
+IfAboveAction=[!SetOptionGroup GroupBars MeterStyle "StyleCoverBar"][!SetOptionGroup GroupProgressBar MeterStyle "StyleCoverBar"][!SetOption MeterCoverBG MeterStyle "StyleCoverMeter"][!SetOptionGroup SongMeta MeterStyle "StyleCoverText"][!DisableMeasure MeasureGenre][!EnableMeasure MeasureGetCoverColor][!EnableMeasure MeasureCoverColor]
 UpdateDivider=-1
 
 [MeasureDisableDynamicFontColors]
@@ -26,13 +26,6 @@ IfEqualValue=1
 IfEqualAction=[!SetOptionGroup SongMeta MeterStyle "StyleStaticText"]
 UpdateDivider=-1
 
-[MeasureFlipProgressbar]
-Measure=Calc
-Formula=#FlipVisualizer#
-IfEqualValue=1
-IfEqualAction=[!SetOption MeterProgressBar Y 0]
-UpdateDivider=-1
-
 [MeasureClipSongInformation]
 Measure=Calc
 Formula=#ClipSongInformation#
@@ -133,4 +126,4 @@ BarColor=[MeasureCoverColor]
 DynamicVariables=1
 [StyleCoverText]
 FontColor=[MeasureCoverColor]
-DynamicVariables=1
+DynamicVariables=1