Author: duncan
Date: Wed Jan 31 20:53:21 2007
New Revision: 9121
Modified:
branches/rel-1/freevo/src/plugins/idlebar/__init__.py
branches/rel-1/freevo/src/plugins/idlebar/encoding.py
Log:
[ 1649009 ] encoding.py too resource intensive
Timing fix suggested by Frank Naude applied
Fixed the removal of space from the idlebar, but didn't fix detachbar
Modified: branches/rel-1/freevo/src/plugins/idlebar/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/idlebar/__init__.py (original)
+++ branches/rel-1/freevo/src/plugins/idlebar/__init__.py Wed Jan 31
20:53:21 2007
@@ -66,6 +66,7 @@
self.bar = None
self.barfile = ''
self.free_space = -1
+ self.used_space = 0
# Getting current LOCALE
try:
@@ -74,6 +75,13 @@
pass
+ def take_space(self, space):
+ '''
+ reserve some space from the idlebar, this is for DaemonPlugins
+ '''
+ self.used_space = space
+
+
def draw(self, (type, object), osd):
"""
draw a background and all idlebar plugins
@@ -102,7 +110,7 @@
add_x = p.draw((type, object), x, osd)
if add_x:
x += add_x + 20
- self.free_space = x
+ self.free_space = x - self.used_space
def eventhandler(self, event, menuw=None):
Modified: branches/rel-1/freevo/src/plugins/idlebar/encoding.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/idlebar/encoding.py (original)
+++ branches/rel-1/freevo/src/plugins/idlebar/encoding.py Wed Jan 31
20:53:21 2007
@@ -62,7 +62,7 @@
_debug_('__init__(self)', 2)
plugin.DaemonPlugin.__init__(self)
#IdleBarPlugin.__init__(self)
- self.poll_interval = 10 # 1/10th seconds (30secs)
+ self.poll_interval = 82 # 82*1/120th seconds (~1sec)
self.draw_interval = self.poll_interval
self.last_interval = self.poll_interval
self.lastdraw = 0
@@ -223,12 +223,12 @@
if hasattr(p, 'clock_left_position'):
self.idlebar_max = p.clock_left_position
- if self.idlebar_max - self.idlebar.free_space < 280:
+ if self.idlebar_max - self.idlebar.free_space < 250:
_debug_('free space in idlebar to small, using normal
detach')
self.idlebar = None
else:
# this doesn't work, but needs to for the detachbar
- self.idlebar.free_space -= 280
+ self.idlebar.take_space(250)
#turn off idlebar for testing
#self.idlebar = None
@@ -271,9 +271,9 @@
if self.idlebar:
if self.image:
- self.bx = self.idlebar.free_space + 70
+ self.bx = self.idlebar.free_space + 250 + 70
else:
- self.bx = self.idlebar.free_space
+ self.bx = self.idlebar.free_space + 250
self.by = osd.y
self.tx = self.bx + self.boxborder + self.padding
self.ty = self.by + self.boxborder + self.padding
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
