Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29612/src/video/plugins
Modified Files:
bmovl.py
Log Message:
fix more crashes
Index: bmovl.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/bmovl.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** bmovl.py 10 Jul 2004 08:44:20 -0000 1.11
--- bmovl.py 10 Jul 2004 10:36:53 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2004/07/10 10:36:53 dischi
+ # fix more crashes
+ #
# Revision 1.11 2004/07/10 08:44:20 dischi
# fix crash
***************
*** 95,98 ****
--- 98,102 ----
self.height = height
self.depth = 32
+ print 'new bmovl interface: %s, %s' % (width, height)
self.screen = pygame.Surface((width, height), pygame.SRCALPHA)
***************
*** 182,187 ****
self.x0, self.y0, self.x1, self.y1 = self.width, self.height, 0, 0
! update = self.screen.subsurface(rect)
!
try:
os.write(self.bmovl, 'RGBA32 %d %d %d %d %d %d\n' % \
--- 186,196 ----
self.x0, self.y0, self.x1, self.y1 = self.width, self.height, 0, 0
! try:
! update = self.screen.subsurface(rect)
! except Exception, e:
! print e
! print rect, self.screen
! return
!
try:
os.write(self.bmovl, 'RGBA32 %d %d %d %d %d %d\n' % \
***************
*** 216,220 ****
print
plugin.Plugin.__init__(self)
! self._type = 'mplayer_video'
--- 225,230 ----
print
plugin.Plugin.__init__(self)
! self._type = 'mplayer_video'
! self.status = 'waiting'
***************
*** 246,249 ****
--- 256,261 ----
self.width = 0
+ self.status = 'playing'
+
if os.path.exists('/tmp/bmovl'):
return command + [ '-vf', 'bmovl=1:0:/tmp/bmovl' ]
***************
*** 338,342 ****
stop bmovl
"""
! if self.bmovl:
self.bmovl.close()
self.bmovl = None
--- 350,355 ----
stop bmovl
"""
! if self.bmovl and self.status == 'playing':
! self.status = 'waiting'
self.bmovl.close()
self.bmovl = None
***************
*** 373,377 ****
self.width = int(width)
self.height = int(height)
! except:
pass
--- 386,390 ----
self.width = int(width)
self.height = int(height)
! except Exception, e:
pass
***************
*** 388,392 ****
update osd
"""
! if not self.bmovl:
self.bmovl = OSDbmovl(self.width, self.height)
--- 401,405 ----
update osd
"""
! if not self.bmovl and self.status == 'playing' and self.height and
self.width:
self.bmovl = OSDbmovl(self.width, self.height)
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
