Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv15688
Modified Files:
mplayer.py
Log Message:
cdda url handling repaired and only stop on playing player
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/mplayer.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mplayer.py 13 Sep 2003 10:08:22 -0000 1.16
--- mplayer.py 15 Sep 2003 20:06:42 -0000 1.17
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.17 2003/09/15 20:06:42 dischi
+ # cdda url handling repaired and only stop on playing player
+ #
# Revision 1.16 2003/09/13 10:08:22 dischi
# i18n support
***************
*** 121,125 ****
# Is the file streamed over the network?
! if filename.find('://') != -1:
# Yes, trust the given mode
network_play = 1
--- 124,129 ----
# Is the file streamed over the network?
! if filename.find('http://') == 0 or filename.find('https://') == 0 or \
! filename.find('mms://') == 0 or filename.find('rtsp://') == 0:
# Yes, trust the given mode
network_play = 1
***************
*** 127,132 ****
network_play = 0
! if not os.path.isfile(filename) and not network_play:
! return _('%s\nnot found!') % os.path.basename(filename)
# Build the MPlayer command
--- 131,136 ----
network_play = 0
! if not os.path.isfile(filename) and filename.find('://') == -1:
! return _('%s\nnot found!') % filename
# Build the MPlayer command
***************
*** 160,165 ****
self.thread.play_mode = self.mode
! if DEBUG:
! print 'MPlayer.play(): Starting thread, cmd=%s' % command
self.thread.mode = 'play'
--- 164,168 ----
self.thread.play_mode = self.mode
! _debug_('MPlayer.play(): Starting thread, cmd=%s' % command)
self.thread.mode = 'play'
***************
*** 173,182 ****
Stop mplayer and set thread to idle
"""
! self.thread.app.write('quit\n')
! self.thread.mode = 'stop'
! self.thread.mode_flag.set()
! self.thread.item = None
! while self.thread.mode == 'stop':
! time.sleep(0.3)
--- 176,186 ----
Stop mplayer and set thread to idle
"""
! if self.mode == 'play':
! self.thread.app.write('quit\n')
! self.thread.mode = 'stop'
! self.thread.mode_flag.set()
! self.thread.item = None
! while self.thread.mode == 'stop':
! time.sleep(0.3)
-------------------------------------------------------
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
