Update submodule, add media variables, align version

bphillips09 · Mar 4, 2024 · fe9f04f · fe9f04f
1 parent 8b8abbc
commit fe9f04f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/Control4-HA-Base b/Control4-HA-Base
diff --git a/commands.lua b/commands.lua
@@ -20,6 +20,13 @@ SHUFFLE = false
 REPEAT = false
 REPEAT_ONE = false
 
+function DRV.OnDriverInit(init)
+    C4:AddVariable("MEDIA_TITLE", "", "STRING")
+    C4:AddVariable("MEDIA_ARTIST", "", "STRING")
+    C4:AddVariable("MEDIA_ALBUM", "", "STRING")
+    C4:AddVariable("MEDIA_APP_NAME", "", "STRING")
+end
+
 function DRV.OnDriverLateInit(init)
     math.randomseed(os.time())
     math.random(); math.random(); math.random()
@@ -346,26 +353,27 @@ function Parse(data)
     selectedAttribute = attributes["media_title"]
     if selectedAttribute ~= nil then
         MEDIA_STATUS.TITLE = selectedAttribute
+        C4:SetVariable("MEDIA_TITLE", selectedAttribute)
     end
 
     selectedAttribute = attributes["media_artist"]
     if selectedAttribute ~= nil then
         MEDIA_STATUS.ARTIST = selectedAttribute
+        C4:SetVariable("MEDIA_ARTIST", selectedAttribute)
     end
 
     selectedAttribute = attributes["media_album_name"]
     if selectedAttribute ~= nil then
         MEDIA_STATUS.ALBUM = selectedAttribute
-    end
-
-    selectedAttribute = attributes["media_artist"]
-    if selectedAttribute ~= nil then
-        MEDIA_STATUS.ARTIST = selectedAttribute
+        C4:SetVariable("MEDIA_ALBUM", selectedAttribute)
     end
 
     selectedAttribute = attributes["app_name"]
-    if selectedAttribute ~= nil and MEDIA_STATUS.TITLE == "" or MEDIA_STATUS.TITLE == nil then
-        MEDIA_STATUS.TITLE = selectedAttribute
+    if selectedAttribute ~= nil then
+        if MEDIA_STATUS.TITLE == "" or MEDIA_STATUS.TITLE == nil then
+            MEDIA_STATUS.TITLE = selectedAttribute
+        end
+        C4:SetVariable("MEDIA_APP_NAME", selectedAttribute)
     end
 
     selectedAttribute = attributes["shuffle"]

diff --git a/driver.xml b/driver.xml
@@ -5,8 +5,8 @@
 	<name>HA Media Player</name>
 	<model>HA Media Player</model>
 	<created>09/10/2023 12:00</created>
-	<modified>02/09/2024 12:00</modified>
-	<version>103</version>
+	<modified>03/04/2024 12:00</modified>
+	<version>102</version>
 	<control>lua_gen</control>
 	<controlmethod>IP</controlmethod>
 	<driver>DriverWorks</driver>