Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv8883
Modified Files:
mplayer.py
Log Message:
draw status while connecting and caching for network files
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/mplayer.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mplayer.py 19 Sep 2003 22:09:15 -0000 1.23
--- mplayer.py 20 Sep 2003 17:03:20 -0000 1.24
***************
*** 21,24 ****
--- 21,27 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.24 2003/09/20 17:03:20 dischi
+ # draw status while connecting and caching for network files
+ #
# Revision 1.23 2003/09/19 22:09:15 dischi
# use new childapp thread function
***************
*** 76,79 ****
--- 79,85 ----
import re
+ import osd
+ osd = osd.get_singleton()
+
# contains an initialized MPlayer() object
mplayer = None
***************
*** 253,257 ****
self.file = item
! self.thread.start(MPlayerApp, (command, item))
self.item = item
--- 259,263 ----
self.file = item
! self.thread.start(MPlayerApp, (command, item, network_play))
self.item = item
***************
*** 388,392 ****
"""
! def __init__(self, (app, item)):
if config.MPLAYER_DEBUG:
fname_out = os.path.join(config.LOGDIR, 'mplayer_stdout.log')
--- 394,398 ----
"""
! def __init__(self, (app, item, network_play)):
if config.MPLAYER_DEBUG:
fname_out = os.path.join(config.LOGDIR, 'mplayer_stdout.log')
***************
*** 409,412 ****
--- 415,419 ----
self.check_audio = 1
+ self.network_play = network_play
self.RE_TIME = re.compile("^A: *([0-9]+)").match
self.RE_START = re.compile("^Starting playback\.\.\.").match
***************
*** 415,419 ****
childapp.ChildApp.__init__(self, app)
self.exit_type = None
!
def kill(self):
--- 422,427 ----
childapp.ChildApp.__init__(self, app)
self.exit_type = None
! self.osdfont = osd.getfont(config.OSD_DEFAULT_FONTNAME,
config.OSD_DEFAULT_FONTSIZE)
!
def kill(self):
***************
*** 445,449 ****
except ValueError:
pass # File closed
!
if line.find("A:") == 0:
m = self.RE_TIME(line) # Convert decimal
--- 453,472 ----
except ValueError:
pass # File closed
!
! if self.network_play:
! if line.find('Opening audio decoder') == 0:
! osd.clearscreen(osd.COL_BLACK)
! osd.update()
! elif (line.find('Resolving ') == 0 or line.find('Connecting to server')
== 0 or \
! line.find('Cache fill:') == 0) and \
! line.find('Resolving reference to') == -1:
! if line.find('Connecting to server') == 0:
! line = 'Connecting to server'
! osd.clearscreen(osd.COL_BLACK)
! osd.drawstringframed(line, config.OVERSCAN_X, config.OVERSCAN_Y,
! osd.width - 2 * config.OVERSCAN_X, -1,
self.osdfont,
! osd.COL_WHITE)
! osd.update()
!
if line.find("A:") == 0:
m = self.RE_TIME(line) # Convert decimal
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
