Changes in / [1:3]

File:

• I_MythTVFrontend1.xml (modified) (4 diffs)

/I_MythTVFrontend1.xml

@@ -47 +47 @@
         local MYTH_FRONTEND_SEND_ACTION_CMD = "http://%s/Frontend/SendAction?Action=%s"
         local MYTH_FRONTEND_GET_STATUS_CMD = "http://%s/Frontend/GetStatus"
-        local MYTH_FRONTEND_GET_SCREENSHOT_CMD = "http://%s/MythFE/GetScreenShot?format=jpg&width=%d"
+        local MYTH_FRONTEND_GET_SCREENSHOT_CMD = "http://%s/MythFE/GetScreenShot?format=jpg&width=%d"
 
         local FRONTEND_SERVICE = "urn:mythttv-org:serviceId:Frontend1"
+        local HADEVICE_SID = "urn:micasaverde-com:serviceId:HaDevice1"
         local PARENT_DEVICE
 
@@ -129 +130 @@
         end
 
+    local function toboolean(v)
+            return (type(v) == "string" and v == "true") or (type(v) == "number" and v ~= 0) or (type(v) == "boolean" and v)
+        end
+
         function mythfrontendPoll()
             local resp = cmdGetStatus()
@@ -136 +141 @@
 
         function mythfrontendRefreshPoll()
-            local pollingEnabled = luup.variable_get(HADEVICE_SID, "PollingEnabled", PARENT_DEVICE)
-            local pollMinDelay = luup.variable_get(HADEVICE_SID, "PollMinDelay", PARENT_DEVICE)
+            local pollingEnabled = toboolean(luup.variable_get(HADEVICE_SID, "PollingEnabled", PARENT_DEVICE))
+            local pollMinDelay = tonumber(luup.variable_get(HADEVICE_SID, "PollMinDelay", PARENT_DEVICE), 10)
             mythfrontendLog("PollingEnabled=" .. tostring(pollingEnabled) .. ", PollMinDelay=" .. tostring(pollMinDelay) )
             if (pollingEnabled) then   
@@ -158 +163 @@
 
             -- make sure we have the polling defined
-            local pollingEnabled = luup.variable_get(HADEVICE_SID, "PollingEnabled", PARENT_DEVICE)
-            local pollMinDelay = luup.variable_get(HADEVICE_SID, "PollMinDelay", PARENT_DEVICE)
-
-            if (pollMinDelay == nil or type(pollMinDelay) ~= "number") then
+            local pollingEnabled = toboolean(luup.variable_get(HADEVICE_SID, "PollingEnabled", PARENT_DEVICE))
+            local pollMinDelay = tonumber(luup.variable_get(HADEVICE_SID, "PollMinDelay", PARENT_DEVICE), 10)
+
+            if (pollMinDelay == nil) then
                 luup.variable_set(HADEVICE_SID, "PollMinDelay", 60, PARENT_DEVICE)
             end
 
-            if (pollingEnabled == nil or type(pollMinDelay) ~= "boolean") then
-                -- according to spec and to bypass bug #0002058, use 1 instead of true
-                luup.variable_set(HADEVICE_SID, "PollingEnabled", 1, PARENT_DEVICE)
-            end
+            if (pollingEnabled == nil) then
+                luup.variable_set(HADEVICE_SID, "PollingEnabled", "true", PARENT_DEVICE)
+            end
+            mythfrontendLog("PollingEnabled=" .. tostring(pollingEnabled) .. ", PollMinDelay=" .. tostring(pollMinDelay) )
             --
             -- Avoid blocking startup
             --
-            luup.call_delay("mythfrontendPoll", 5)
+            if (pollingEnabled) then
+                luup.call_delay("mythfrontendPoll", 5)
+            end
             return true, "Good to go", "MythFrontend"
         end