Author: duncan
Date: Wed Jan 23 16:37:52 2008
New Revision: 10310
Log:
Update for kaa changes, wonder what is broken...
Modified:
branches/rel-1/freevo/src/animation/base.py
branches/rel-1/freevo/src/audio/plugins/mplayervis.py
branches/rel-1/freevo/src/event.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/helpers/schedulefavorites.py
branches/rel-1/freevo/src/main.py
branches/rel-1/freevo/src/plugins/wiimote.py
branches/rel-1/freevo/src/rc.py
branches/rel-1/freevo/src/tv/plugins/dvbstreamer/vlc_live_pause.py
branches/rel-1/freevo/src/tv/plugins/upsoon.py
branches/rel-1/freevo/src/tv/record_client.py
Modified: branches/rel-1/freevo/src/animation/base.py
==============================================================================
--- branches/rel-1/freevo/src/animation/base.py (original)
+++ branches/rel-1/freevo/src/animation/base.py Wed Jan 23 16:37:52 2008
@@ -33,7 +33,7 @@
import pygame.time
import osd, render
-from kaa.notifier import Timer
+from kaa import Timer
class BaseAnimation:
"""
Modified: branches/rel-1/freevo/src/audio/plugins/mplayervis.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/mplayervis.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/mplayervis.py Wed Jan 23
16:37:52 2008
@@ -43,9 +43,9 @@
# freevo modules
import plugin, config, rc, skin, osd, time
-from event import *
-from animation import render, BaseAnimation
-from kaa.notifier import Timer
+from event import *
+from animation import render, BaseAnimation
+from kaa import Timer
mmap_file = '/tmp/mpav'
skin = skin.get_singleton()
Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py (original)
+++ branches/rel-1/freevo/src/event.py Wed Jan 23 16:37:52 2008
@@ -28,9 +28,9 @@
#
# -----------------------------------------------------------------------
-import kaa.notifier
+import kaa
-class Event(kaa.notifier.Event):
+class Event(kaa.Event):
"""
an event is passed to the different eventhandlers in Freevo to
activate some action.
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Wed Jan 23 16:37:52 2008
@@ -36,9 +36,10 @@
import config
from util import vfs
+import kaa
import kaa.rpc
-import kaa.notifier
-from kaa.notifier import EventHandler, AtTimer
+from kaa import EventHandler
+from kaa import AtTimer
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
appconf = appname.upper()
@@ -664,7 +665,7 @@
for chan in guide.chan_list:
if prog.channel_id == chan.id:
prog.tunerid = chan.tunerid
- _debug_('%s tuner: %s' % (prog, prog.tunerid), 1)
+ _debug_('%s tuner: %s' % (prog, prog.tunerid), 2)
return prog
@@ -1714,7 +1715,7 @@
def main():
- kaa.notifier.init('twisted')
+ kaa.main.select_notifier('twisted_experimental')
socket = (config.RECORDSERVER_IP, config.RECORDSERVER_PORT2)
secret = config.RECORDSERVER_SECRET
@@ -1730,12 +1731,15 @@
reactor.listenTCP(config.RECORDSERVER_PORT, server.Site(rs))
rs.startMinuteCheck()
- reactor.run()
- _debug_('reactor stopped.')
- kaa.notifier.shutdown()
- _debug_('kaa.notifier stopped.')
+ #reactor.run()
+ #_debug_('reactor stopped.')
+ #kaa.main.stop()
+ kaa.main.run()
+ _debug_('kaa.main running.')
+ #kaa.main.stop()
+ #_debug_('kaa.main stopped.')
- #kaa.notifier.AtTimer(rs.handleTimer).start(sec=45)
+ #kaa.AtTimer(rs.handleTimer).start(sec=45)
#kaa.main()
Modified: branches/rel-1/freevo/src/helpers/schedulefavorites.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/schedulefavorites.py (original)
+++ branches/rel-1/freevo/src/helpers/schedulefavorites.py Wed Jan 23
16:37:52 2008
@@ -33,7 +33,7 @@
import config
-import kaa.notifier
+import kaa
from tv.record_client import RecordClient
def handler(result):
@@ -45,4 +45,4 @@
print _('recordserver is not running')
raise SystemExit
-kaa.main()
+kaa.main.run()
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Wed Jan 23 16:37:52 2008
@@ -57,8 +57,8 @@
import Numeric
import config
+ import kaa
import kaa.metadata as mmpython
- import kaa.notifier
import kaa.imlib2 as Image
@@ -251,7 +251,7 @@
self.eventlistener_plugins.append(p)
else:
self.eventhandler_plugins.append(p)
- kaa.notifier.EventHandler(self.eventhandler).register()
+ kaa.EventHandler(self.eventhandler).register()
def eventhandler(self, event):
@@ -467,7 +467,7 @@
MainTread()
- kaa.notifier.loop()
+ kaa.main.run()
except KeyboardInterrupt:
Modified: branches/rel-1/freevo/src/plugins/wiimote.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/wiimote.py (original)
+++ branches/rel-1/freevo/src/plugins/wiimote.py Wed Jan 23 16:37:52 2008
@@ -28,7 +28,7 @@
import bluetooth
# kaa imports
-import kaa.notifier
+import kaa
import time
@@ -184,13 +184,13 @@
self.cx.settimeout(2)
self.rx.settimeout(2)
- self.rx_dispatcher = kaa.notifier.SocketDispatcher(self.handle_receive)
+ self.rx_dispatcher = kaa.SocketDispatcher(self.handle_receive)
# start immediately for the first time
- self.timer = kaa.notifier.Timer(self.onTimer)
+ self.timer = kaa.Timer(self.onTimer)
self.timer.start(0.1)
- self.acc_timer = kaa.notifier.Timer(self.on_acc_timer)
+ self.acc_timer = kaa.Timer(self.on_acc_timer)
self.active = True
Modified: branches/rel-1/freevo/src/rc.py
==============================================================================
--- branches/rel-1/freevo/src/rc.py (original)
+++ branches/rel-1/freevo/src/rc.py Wed Jan 23 16:37:52 2008
@@ -35,7 +35,7 @@
import thread
import types
-import kaa.notifier
+import kaa
import config
import evdev
@@ -485,7 +485,7 @@
self.lock = thread.allocate_lock()
# last time we stopped sleeping
self.sleep_timer = 0
- kaa.notifier.Timer(self.poll).start(0.01)
+ kaa.Timer(self.poll).start(0.01)
def set_app(self, app, context):
Modified: branches/rel-1/freevo/src/tv/plugins/dvbstreamer/vlc_live_pause.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/dvbstreamer/vlc_live_pause.py
(original)
+++ branches/rel-1/freevo/src/tv/plugins/dvbstreamer/vlc_live_pause.py Wed Jan
23 16:37:52 2008
@@ -50,7 +50,7 @@
import util
import osd
import childapp
-import kaa.notifier
+import kaa
from tv.channels import FreevoChannels
@@ -172,9 +172,9 @@
self.cur_audiodev = None
self.lastchan = None
- self.timer = kaa.notifier.Timer(self.__update_data_from_vlc)
- self.timer_start = kaa.notifier.OneShotTimer(
self.__update_data_from_vlc)
- self.timer_disablebuffering = kaa.notifier.OneShotTimer(
self.disable_buffering)
+ self.timer = kaa.Timer(self.__update_data_from_vlc)
+ self.timer_start = kaa.OneShotTimer( self.__update_data_from_vlc)
+ self.timer_disablebuffering = kaa.OneShotTimer( self.disable_buffering)
if hasattr(config, 'LIVE_PAUSE_BUFFER_TIMEOUT'):
self. buffering_timeout=config.LIVE_PAUSE_BUFFER_TIMEOUT
Modified: branches/rel-1/freevo/src/tv/plugins/upsoon.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/upsoon.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/upsoon.py Wed Jan 23 16:37:52 2008
@@ -41,7 +41,9 @@
import thread
import tv.v4l2
from tv.record_client import RecordClient
-from kaa.notifier import Timer, EventHandler
+import kaa
+from kaa import Timer
+from kaa import EventHandler
from tv.channels import FreevoChannels
from util.marmalade import jellyToXML, unjellyFromXML
from gui import AlertBox
@@ -250,7 +252,7 @@
#import rc as rctrl
#rc = rctrl.get_singleton(False)
pi = PluginInterface()
- kaa.main()
+ kaa.main.run()
elif function == 'findnextprogram':
def handler(result):
@@ -258,14 +260,14 @@
print result.__dict__
raise SystemExit
server.findNextProgram(handler)
- kaa.main()
+ kaa.main.run()
elif function == 'isplayerrunning':
def handler(result):
print 'isplayerrunning=%r' % (result)
raise SystemExit
server.isPlayerRunning(handler)
- kaa.main()
+ kaa.main.run()
else:
fc = FreevoChannels()
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Wed Jan 23 16:37:52 2008
@@ -33,8 +33,8 @@
import time
import config
+import kaa
import kaa.rpc
-import kaa.notifier
import time, sys, socket, traceback, string
import xmlrpclib
import epg_types
@@ -408,7 +408,7 @@
rc = RecordClient()
rc.getScheduledRecordings(handler)
- kaa.main()
+ kaa.main.run()
if len(sys.argv) >= 2:
function = sys.argv[1].lower()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
