Update of /cvsroot/freevo/freevo/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv784/src/image
Modified Files:
Tag: rel-1-5
viewer.py
Log Message:
remove the buggy signal() code from the imageviewer and use rc.(un)register
Index: viewer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/viewer.py,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** viewer.py 11 Jul 2004 10:39:45 -0000 1.52
--- viewer.py 6 Sep 2004 16:37:02 -0000 1.52.2.1
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.52.2.1 2004/09/06 16:37:02 dischi
+ # remove the buggy signal() code from the imageviewer and use rc.(un)register
+ #
# Revision 1.52 2004/07/11 10:39:45 dischi
# replaced AlertBox with normal warning on screen
***************
*** 47,51 ****
- import signal
import os
--- 50,53 ----
***************
*** 87,95 ****
str(IMAGE_ZOOM_GRID8):8, str(IMAGE_ZOOM_GRID9):9 }
! self.slideshow = True # currently in slideshow mode
self.app_mode = 'image'
self.last_image = (None, None)
self.osd = osd.get_singleton()
self.free_cache()
--- 89,99 ----
str(IMAGE_ZOOM_GRID8):8, str(IMAGE_ZOOM_GRID9):9 }
! self.slideshow = True
self.app_mode = 'image'
self.last_image = (None, None)
self.osd = osd.get_singleton()
+ self.signal_registered = False
+
self.free_cache()
***************
*** 290,296 ****
# start timer
! if self.fileitem.duration:
! signal.signal(signal.SIGALRM, self.signalhandler)
! signal.alarm(self.fileitem.duration)
self.last_image = (item, (image, x, y, scale, bbx, bby, bbw, bbh,
--- 294,300 ----
# start timer
! if self.fileitem.duration and self.slideshow and not self.signal_registered:
! rc.register(self.signalhandler, False, self.fileitem.duration*100)
! self.signal_registered = True
self.last_image = (item, (image, x, y, scale, bbx, bby, bbw, bbh,
***************
*** 326,333 ****
! def signalhandler(self, signum, frame):
! if rc.app() == self.eventhandler and self.slideshow:
! rc.app(None)
! self.eventhandler(PLAY_END)
--- 330,336 ----
! def signalhandler(self):
! self.signal_registered = False
! self.eventhandler(PLAY_END)
***************
*** 337,351 ****
rc.post_event(Event(OSD_MESSAGE, arg=_('pause')))
self.slideshow = False
! signal.alarm(0)
else:
rc.post_event(Event(OSD_MESSAGE, arg=_('play')))
self.slideshow = True
! signal.alarm(1)
return True
elif event == STOP:
self.last_image = None, None
rc.app(None)
- signal.alarm(0)
self.fileitem.eventhandler(event)
return True
--- 340,357 ----
rc.post_event(Event(OSD_MESSAGE, arg=_('pause')))
self.slideshow = False
! rc.unregister(self.signalhandler)
! self.signal_registered = False
else:
rc.post_event(Event(OSD_MESSAGE, arg=_('play')))
self.slideshow = True
! rc.register(self.signalhandler, False, 100)
! self.signal_registered = True
return True
elif event == STOP:
self.last_image = None, None
+ self.signal_registered = False
+ rc.unregister(self.signalhandler)
rc.app(None)
self.fileitem.eventhandler(event)
return True
***************
*** 354,359 ****
# event to the playlist
elif event == PLAYLIST_NEXT or event == PLAYLIST_PREV:
! self.slideshow = False
! signal.alarm(0)
self.fileitem.eventhandler(event)
return True
--- 360,365 ----
# event to the playlist
elif event == PLAYLIST_NEXT or event == PLAYLIST_PREV:
! self.signal_registered = False
! rc.unregister(self.signalhandler)
self.fileitem.eventhandler(event)
return True
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
