Author: dmeyer
Date: Fri Apr  7 18:43:04 2006
New Revision: 1389

Modified:
   trunk/base/src/input/__init__.py
   trunk/base/src/input/stdin.py
   trunk/canvas/test/animation/menu.py
   trunk/player/test/play.py
   trunk/xine/test/kaaplayer.py
   trunk/xine/test/play.py
   trunk/xine/test/test.py

Log:
update stdin stuff, you must import kaa.input.stdin now

Modified: trunk/base/src/input/__init__.py
==============================================================================
--- trunk/base/src/input/__init__.py    (original)
+++ trunk/base/src/input/__init__.py    Fri Apr  7 18:43:04 2006
@@ -1,2 +1 @@
 import lirc
-import stdin

Modified: trunk/base/src/input/stdin.py
==============================================================================
--- trunk/base/src/input/stdin.py       (original)
+++ trunk/base/src/input/stdin.py       Fri Apr  7 18:43:04 2006
@@ -7,6 +7,8 @@
 import kaa
 import kaa.notifier
 
+__all__ = [ 'signal' ]
+
 _tc_orig_settings = None
 _getch_enabled = False
 
@@ -92,15 +94,15 @@
 
 _dispatcher = kaa.notifier.SocketDispatcher(_handle_stdin_keypress)
 
-def _keypress_signal_changed(signal, flag):
-    if flag == kaa.notifier.Signal.SIGNAL_CONNECTED and signal.count() == 1:
+def _keypress_signal_changed(s, flag):
+    if flag == kaa.notifier.Signal.SIGNAL_CONNECTED and s.count() == 1:
         getch_enable()
         _dispatcher.register(sys.stdin)
-    elif flag == kaa.notifier.Signal.SIGNAL_DISCONNECTED and signal.count() == 
0:
+    elif flag == kaa.notifier.Signal.SIGNAL_DISCONNECTED and s.count() == 0:
         getch_disable()
         _dispatcher.unregister()
 
 
 # init
-_signal = kaa.notifier.Signal(changed_cb = _keypress_signal_changed)
-kaa.signals["stdin_key_press_event"] = _signal
+signal = kaa.notifier.Signal(changed_cb = _keypress_signal_changed)
+kaa.signals["stdin_key_press_event"] = signal

Modified: trunk/canvas/test/animation/menu.py
==============================================================================
--- trunk/canvas/test/animation/menu.py (original)
+++ trunk/canvas/test/animation/menu.py Fri Apr  7 18:43:04 2006
@@ -1,4 +1,5 @@
 from kaa import canvas, input
+import kaa.input.stdin
 import kaa, sys
 
 

Modified: trunk/player/test/play.py
==============================================================================
--- trunk/player/test/play.py   (original)
+++ trunk/player/test/play.py   Fri Apr  7 18:43:04 2006
@@ -1,5 +1,5 @@
 import kaa, sys
-import kaa.player, kaa.canvas, kaa.input
+import kaa.player, kaa.canvas, kaa.input, kaa.input.stdin
 
 print  kaa.player.xine.config.deinterlacer.method
 kaa.player.xine.config.deinterlacer.method = 'Toms'

Modified: trunk/xine/test/kaaplayer.py
==============================================================================
--- trunk/xine/test/kaaplayer.py        (original)
+++ trunk/xine/test/kaaplayer.py        Fri Apr  7 18:43:04 2006
@@ -2,7 +2,7 @@
 
 import sys, math, threading, os, time, gc
 
-import kaa, kaa.input
+import kaa, kaa.input, kaa.input.stdin
 from kaa import xine, display, metadata, notifier
 
 if len(sys.argv) <= 1:

Modified: trunk/xine/test/play.py
==============================================================================
--- trunk/xine/test/play.py     (original)
+++ trunk/xine/test/play.py     Fri Apr  7 18:43:04 2006
@@ -2,7 +2,7 @@
 
 import sys, math, threading, os, time, gc
 
-import kaa, kaa.input
+import kaa, kaa.input, kaa.input.stdin
 from kaa import xine, display, metadata, notifier
 
 

Modified: trunk/xine/test/test.py
==============================================================================
--- trunk/xine/test/test.py     (original)
+++ trunk/xine/test/test.py     Fri Apr  7 18:43:04 2006
@@ -4,7 +4,7 @@
 
 import sys, math, threading, os, time, gc
 
-import kaa, kaa.input
+import kaa, kaa.input, kaa.input.stdin
 from kaa import xine, display, metadata, notifier, evas
 
 if len(sys.argv) <= 1:


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to