Author: dmeyer
Date: Tue Jan 16 18:02:35 2007
New Revision: 8985
Modified:
trunk/ui/src/input/plugins/lirc.py
Log:
use lirc from kaa
Modified: trunk/ui/src/input/plugins/lirc.py
==============================================================================
--- trunk/ui/src/input/plugins/lirc.py (original)
+++ trunk/ui/src/input/plugins/lirc.py Tue Jan 16 18:02:35 2007
@@ -1,40 +1,21 @@
# -*- coding: iso-8859-1 -*-
-# -----------------------------------------------------------------------
+# -----------------------------------------------------------------------------
# lirc.py - A lirc input plugin for Freevo.
-# -----------------------------------------------------------------------
+# -----------------------------------------------------------------------------
# $Id$
#
# This file handles the lirc input device and maps it to freevo events.
# If /dev/lirc is present, this plugin will be actiavted by
# freevo_config.py.
#
-# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.7 2005/08/07 14:26:36 dischi
-# replace pyNotifier with kaa.notifier
-#
-# Revision 1.6 2005/05/07 18:09:41 dischi
-# move InputPlugin definition to input.interface
-#
-# Revision 1.5 2004/10/13 20:08:25 dischi
-# fix handle to match notifier callback
-#
-# Revision 1.4 2004/10/06 19:24:02 dischi
-# switch from rc.py to pyNotifier
-#
-# Revision 1.3 2004/09/27 18:40:34 dischi
-# reworked input handling again
-#
-# Revision 1.2 2004/09/25 23:38:15 mikeruelle
-# more missing imports
+# -----------------------------------------------------------------------------
+# Freevo - A Home Theater PC framework
+# Copyright (C) 2002-2007 Krister Lagerstrom, Dirk Meyer, et al.
#
-# Revision 1.1 2004/09/25 04:39:07 rshortt
-# An input plugin for lirc: plugin.activate('input.lirc')
+# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
+# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# -----------------------------------------------------------------------
-# Freevo - A Home Theater PC framework
-# Copyright (C) 2002-2005 Krister Lagerstrom, Dirk Meyer, et al.
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -50,129 +31,17 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
-
-import kaa.notifier
+# -----------------------------------------------------------------------------
+import kaa.input.lirc
import config
-import time
-import os
-
from input.interface import InputPlugin
-try:
- import pylirc
-except ImportError:
- print 'WARNING: PyLirc not found, lirc remote control disabled!'
- raise Exception
-
-
class PluginInterface(InputPlugin):
"""
Input plugin for lirc
"""
def __init__(self):
InputPlugin.__init__(self)
-
- try:
- if os.path.isfile(config.LIRCRC):
- fd = pylirc.init('freevo', config.LIRCRC)
- kaa.notifier.SocketDispatcher(self.handle).register(fd)
- pylirc.blocking(0)
- else:
- raise IOError
- except RuntimeError, e:
- print 'WARNING: Could not initialize PyLirc!'
- raise e
- except IOError, e:
- print 'WARNING: %s not found!' % config.LIRCRC
- raise e
-
- self.nextcode = pylirc.nextcode
- self.previous_returned_code = None
- self.previous_code = None;
- self.repeat_count = 0
- self.firstkeystroke = 0.0
- self.lastkeystroke = 0.0
- self.lastkeycode = ''
-
-
- def config(self):
- return [('LIRCRC', '/etc/freevo/lircrc',
- 'Location of Freevo lircrc file.'),
- ('LIRC_DELAY1', 0.25, 'Repeat delay 1.'),
- ('LIRC_DELAY2', 0.25, 'Repeat delay 2.'),
- ]
-
-
- def get_last_code(self):
- """
- read the lirc interface
- """
- result = None
-
- if self.previous_code != None:
- # Let's empty the buffer and return the most recent code
- while 1:
- list = self.nextcode();
- if list != []:
- break
- else:
- list = self.nextcode()
-
- if list == []:
- # It's a repeat, the flag is 0
- list = self.previous_returned_code
- result = list
-
- elif list != None:
- # It's a new code (i.e. IR key was released), the flag is 1
- self.previous_returned_code = list
- result = list
-
- self.previous_code = result
- return result
-
-
-
- def handle( self ):
- """
- return next event
- """
- list = self.get_last_code()
-
- if list == None:
- nowtime = 0.0
- nowtime = time.time()
- if (self.lastkeystroke + config.LIRC_DELAY2 < nowtime) and \
- (self.firstkeystroke != 0.0):
- self.firstkeystroke = 0.0
- self.lastkeystroke = 0.0
- self.repeat_count = 0
-
- if list != None:
- nowtime = time.time()
-
- if list:
- for code in list:
- if ( self.lastkeycode != code ):
- self.lastkeycode = code
- self.lastkeystroke = nowtime
- self.firstkeystoke = nowtime
-
- if self.firstkeystroke == 0.0 :
- self.firstkeystroke = time.time()
- else:
- if (self.firstkeystroke + config.LIRC_DELAY1 > nowtime):
- list = []
- else:
- if (self.lastkeystroke + config.LIRC_DELAY2 < nowtime):
- self.firstkeystroke = nowtime
-
- self.lastkeystroke = nowtime
- self.repeat_count += 1
-
- for code in list:
- self.post_key(code)
-
- return True
+ kaa.input.lirc.init('freevo', config.LIRCRC)
+ kaa.input.lirc.signal.connect(self.post_key)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
