Changeset 103:53ed1f0943b8

Timestamp:

10/26/08 18:20:58 (3 years ago)

Author:

chris

Branch:

unix

Message:

added an OSD alert device

Files:

• OsdAlertDevice.py (added)
• StormConfig.py (modified) (6 diffs)

StormConfig.py

@@ -52 +52 @@
 from SmsAlertDevice import *
 from ExecutionAlertDevice import *
+from OsdAlertDevice import *
 
 __APPNAME__ = "StormXmlSiren"
@@ -60 +61 @@
                 self.devices           = []
                 self.__history_file    = ''
-                self.__jabber_support  = False
                 self.log               = logging.getLogger('StormConfig')
                 self.__max_history     = History.DEFAULT_MAX_HISTORICAL_EVENTS
@@ -73 +73 @@
                 jabberLoadAttempted = False
                 jabber_available    = False
+                osdLoadAttempted = False
+                osd_available    = False
+
                 smtpInfo            = EmailAlertDeviceInfo()
                 jabberInfo          = JabberAlertDeviceInfo()
                 mediaInfo           = MediaAlertDeviceInfo()
                 exeInfo             = ExecutionAlertDeviceInfo()
+                osdInfo             = OsdAlertDeviceInfo()
 
                 xstates = self.getRequired('main','states')
@@ -133 +137 @@
                                                 self.devices.append(JabberAlertDevice(to,jabberInfo,alerts,areas))
                                         else:
-                                                self.log.warning("Jabber Support Not Enabled, but Jabber Device Requested!")
+                                                self.log.error("Jabber Support Not Enabled, but Jabber Device Requested!")
+                                if(dev == "osd"):
+                                        if(not osdLoadAttempted):
+                                                osd_available = self.__loadOsd()
+                                                osdLoadAttempted = True
+
+                                        if(osd_available):
+                                                position = self.get(str(i),"position", DEFAULT_OSD_POSITION)
+                                                alignment = self.get(str(i),"alignment", DEFAULT_OSD_ALIGNMENT)
+                                                offset = int(self.get(str(i),"offset", DEFAULT_OSD_OFFSET))
+                                                timeout = int(self.get(str(i),"timeout", DEFAULT_OSD_TIMEOUT))
+                                                color = self.get(str(i),"color", DEFAULT_OSD_COLOR)
+                                                font = self.get(str(i),"font", DEFAULT_OSD_FONT)
+                                                self.devices.append(OsdAlertDevice(OsdAlertDeviceInfo(position,
+                                                                                                                                                                alignment,
+                                                                                                                                                                offset,
+                                                                                                                                                                timeout,
+                                                                                                                                                                color,
+                                                                                                                                                                font),
+                                                                                                                        alerts,areas))
+                                        else:
+                                                self.log.error("OSD Support Not Enabled, but OSD Device Requested!")
                                 if(dev == "mythtv"):
                                         to = self.getRequired(str(i),"to")
@@ -160 +185 @@
         def __loadXmpp(self):
                 try:
+                        import xmpp
                         self.log.info("Jabber support enabled")
-                        import xmpp
-                        self.jabber_support = True
                         return True
                 except ImportError:
@@ -168 +192 @@
                         return False
 
+        def __loadOsd(self):
+                try:
+                        import pyosd
+                        self.log.info("Osd support enabled")
+                        return True
+                except ImportError:
+                        self.log.error("pyosd not found, disabling OSD support")
+                        return False
+
         def getStates(self):
                 return self.__states