Add workaround utility function to support new Linux CEC kernel subsystem

Author: emansom

cecdaemon/cecdaemon.py

@@ -13,6 +13,7 @@
 from .remote import Remote
 from .tv import Tv
 from .trigger import Trigger
+from .util import cec_init
 
 
 class CecDaemon():
@@ -25,7 +26,7 @@ def __init__(self):
         self._parse_args()
         self._setup_logging()
         logging.info('Initializing CEC device, please wait...')
-        cec.init()
+        cec_init()
         logging.info('CEC Initialized')
 
         if os.path.isfile(self.args.conffile):

cecdaemon/cecusercodes.py

@@ -6,7 +6,7 @@
 from time import sleep
 import cec
 from cecdaemon.const import USER_CONTROL_CODES
-
+from .util import cec_init
 
 def print_keycode(event, *data):
     """ Takes a python-cec cec.EVENT_COMMAND callback and prints the user control code
@@ -32,7 +32,7 @@ def main():
     """
     print('Initializing CEC, please wait...')
     print('If this takes too long ensure the device is not already in use')
-    cec.init()
+    cec_init()
     cec.add_callback(print_keycode, 2)
     print('CEC device initialized, press remote keys or hit ^C to quit')
 

cecdaemon/util.py

@@ -0,0 +1,20 @@
+""" Utility functions
+"""
+
+import pyudev
+import cec
+
+def cec_init():
+    """ libcec gained support for the new CEC Linux kernel subsystem. However,
+        it currently doesn't use this by default. So we check for the existence
+        of the device created by the new kernel module and then use it if it's
+        found.
+    """
+
+    context = pyudev.Context()
+    devices = list(context.list_devices(subsystem='cec'))
+
+    if len(devices) > 0:
+        cec.init('Linux')
+    else:
+        cec.init()

tests/remotetest.py

@@ -5,6 +5,7 @@
 from time import sleep
 import cec
 from cecdaemon.remote import Remote
+from cecdaemon.util import cec_init
 
 CONF = {
     '0': 'KEY_ENTER',
@@ -16,7 +17,7 @@
 
 logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 
-cec.init()
+cec_init()
 
 remote = Remote(cec, CONF)
 

tests/triggertest.py

@@ -5,12 +5,13 @@
 from time import sleep
 import cec
 from cecdaemon.trigger import Trigger
+from cecdaemon.util import cec_init
 
 CONF = {'standby': '/usr/bin/whoami', 'wake': '/usr/bin/whoami',}
 logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 
 trigger = Trigger(cec, CONF)
-cec.init()
+cec_init()
 
 while True:
     sleep(1)

tests/tvtest.py

@@ -6,12 +6,13 @@
 from time import sleep
 import cec
 from cecdaemon.tv import Tv
+from cecdaemon.util import cec_init
 
 CONF = {'name': 'TESTSAT'}
 
 logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 
-cec.init()
+cec_init()
 television = Tv(cec, CONF)
 
 while True: