Merge branch 'develop'

redsaph · Feb 13, 2019 · e884432 · e884432
2 parents ec3bc73 + bdd8f19
commit e884432
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 8 deletions.
diff --git a/@Resources/align.lua b/@Resources/align.lua
@@ -4,7 +4,7 @@
 -- ALIGNMENT MODULE
 -- Made by Redsaph exclusively for Cleartext
 --
--- redsaph.ml
+-- redsaph.xyz
 -- github.com/redsaph/cleartext
 --
 -- If you have read this and have the intention

diff --git a/@Resources/base.ini b/@Resources/base.ini
@@ -52,6 +52,13 @@ PlayerType=TITLE
 RegExpSubstitute=#removeExtraFromText#
 Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1"
 
+[mTitle1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Title
+RegExpSubstitute=#removeExtraFromText#
+Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1"
+
 [mTitle2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -66,6 +73,13 @@ PlayerType=ARTIST
 RegExpSubstitute=#removeExtraFromText#
 Substitute="^(?siU)^(.+)((-|,).+)+$":"\1"
 
+[mArtist1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Artist
+RegExpSubstitute=#removeExtraFromText#
+Substitute="^(?siU)^(.+)((-|,).+)+$":"\1"
+
 [mArtist2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -80,6 +94,13 @@ PlayerType=ALBUM
 RegExpSubstitute=#removeExtraFromText#
 Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1"
 
+[mAlbum1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Album
+RegExpSubstitute=#removeExtraFromText#
+Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1"
+
 [mAlbum2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -93,6 +114,12 @@ PlayerName=#Player#
 PlayerType=POSITION
 UpdateDivider=20
 
+[mPosition1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Position
+UpdateDivider=20
+
 [mPosition2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -106,6 +133,12 @@ PlayerName=#Player#
 PlayerType=DURATION
 UpdateDivider=20
 
+[mLength1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Duration
+UpdateDivider=20
+
 [mLength2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -124,6 +157,17 @@ Measure=Calc
 Formula=[mProgress0W] / 100
 DynamicVariables=1
 
+[mProgress1W]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Progress
+UpdateDivider=20
+
+[mProgress1P]
+Measure=Calc
+Formula=[mProgress1W] / 100
+DynamicVariables=1
+
 [mProgress2W]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -142,19 +186,30 @@ PlayerName=#Player#
 PlayerType=STATE
 Substitute="0":"play","1":"pause","2":"play"
 
+[mStateButton1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=State
+Substitute="0":"play","1":"pause","2":"play"
+
 [mStateButton2]
 Measure=Plugin
 Plugin=WebNowPlaying
 PlayerType=State
 Substitute="0":"play","1":"pause","2":"play","3":"replay"
 
-
 [mStatus0]
 Measure=NowPlaying
 PlayerName=#currentlySetPlayer#
 PlayerType=Status
 UpdateDivider=10
 
+[mStatus1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Status
+UpdateDivider=10
+
 [mStatus2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -172,6 +227,17 @@ IfAboveAction=!ShowFade
 Disabled=(#MusicSwitch# = 0 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1)
 UpdateDivider=10
 
+[mAdaptiveHide1]
+Measure=Plugin
+Plugin=GPMDPPlugin
+PlayerInfo=Status
+IfBelowValue=1
+IfBelowAction=!HideFade
+IfAboveValue=0
+IfAboveAction=!ShowFade
+Disabled=(#MusicSwitch# = 1 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1)
+UpdateDivider=10
+
 [mAdaptiveHide2]
 Measure=Plugin
 Plugin=WebNowPlaying
@@ -193,7 +259,7 @@ UpdateDivider=10
 [mVersion]
 Measure=Plugin
 Plugin=WebParser
-URL=http://www.redsaph.ml/updates/cleartext/version.ini
+URL=http://www.redsaph.x10.mx/updates/cleartext/version.ini
 RegExp=(?siU)(.*)$
 UpdateDivider=20
 UpdateRate=600

diff --git a/@Resources/constant.inc b/@Resources/constant.inc
@@ -1,6 +1,6 @@
 [Variables]
 
-currentVersion=511
+currentVersion=520
 
 baseColumn1=42
 baseColumn2=220

diff --git a/@Resources/settings.lua b/@Resources/settings.lua
@@ -4,7 +4,7 @@
 -- SETTINGS MODULE
 -- Made by Redsaph exclusively for Cleartext
 --
--- redsaph.ml
+-- redsaph.xyz
 -- github.com/redsaph/cleartext
 --
 -- If you have read this and have the intention
@@ -13,7 +13,7 @@
 --
 -- Thank you very much.
 --
--- Last modified by Redsaph on July 28, 2018
+-- Last modified by Redsaph on February 13, 2019
 --
 
 playerTable = {
@@ -52,6 +52,11 @@ playerTable = {
 		musicSwitch = "2",
 		player = "Spotify"
 	},
+	["GPMDP"] = {
+		playerController = "StateButton1",
+		musicSwitch = "1",
+		player = "Spotify"
+	},
 	["MediaMonkey"] = {
 		playerController = "Title0",
 		musicSwitch = "0",

diff --git a/@Resources/variables.inc b/@Resources/variables.inc
@@ -11,7 +11,7 @@ activePlugin=NowPlaying
 topTextWidth=551
 bottomTextWidth=160
 
-; 0 = MUSIC, 2 = WEBNOWPLAYING
+; 0 = MUSIC, 1=GPMDP, 2 = WEBNOWPLAYING
 MusicSwitch=0
 playerController=Title0
 currentlySetName=Windows Media Player

diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini
diff --git a/Cleartext.ini b/Cleartext.ini
diff --git a/Settings/Settings.ini b/Settings/Settings.ini
diff --git a/_Defaults/defaultvariables.ini b/_Defaults/defaultvariables.ini
@@ -11,7 +11,7 @@ activePlugin=NowPlaying
 topTextWidth=551
 bottomTextWidth=160
 
-; 0 = MUSIC, 2 = WEBNOWPLAYING
+; 0 = MUSIC, 1=GPMDP, 2 = WEBNOWPLAYING
 MusicSwitch=0
 playerController=Title0
 currentlySetName=Windows Media Player