Author: duncan
Date: Wed Mar 21 20:38:45 2007
New Revision: 9373
Modified:
branches/rel-1/freevo/src/audio/plugins/mplayer.py
Log:
Removed a debug that is duplicated in childapp
Removed some whitespace
Modified: branches/rel-1/freevo/src/audio/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/mplayer.py Wed Mar 21 20:38:45 2007
@@ -125,7 +125,7 @@
if hasattr(item, 'is_playlist') and item.is_playlist:
is_playlist = True
- if item.network_play and ( str(filename).endswith('m3u') or
str(filename).endswith('pls')):
+ if item.network_play and (str(filename).endswith('m3u') or
str(filename).endswith('pls')):
is_playlist = True
if str(filename).find(".jsp?") >= 0:
@@ -159,8 +159,6 @@
self.item = item
- _debug_('MPlayer.play(): Starting cmd=%s' % command)
-
self.app = MPlayerApp(command, self)
return None
@@ -202,7 +200,7 @@
self.app.write('%s\n' % event.arg)
return True
- if event in ( STOP, PLAY_END, USER_END ):
+ if event in (STOP, PLAY_END, USER_END):
self.playerGUI.stop()
return self.item.eventhandler(event)
@@ -236,15 +234,15 @@
# [0] -> start of line to check with mplayer output
# [1] -> keyword to store info in self.item.info
self.STREAM_KEYWORDS = [
- ( "Genre : ", "genre" ),
- ( "Artist : ", "artist" ),
- ( "Name : ", "stream_name" ),
- ( " Genre: ", "genre" ),
- ( " Artist: ", "artist" ),
- ( " Name: ", "stream_name" ),
- ( "Demuxer info Name changed to ", "stream_name" ),
- ( "Demuxer info Genre changed to ", "genre" ),
- ( "Demuxer info Artist changed to ", "artist" )
+ ("Genre : ", "genre"),
+ ("Artist : ", "artist"),
+ ("Name : ", "stream_name"),
+ (" Genre: ", "genre"),
+ (" Artist: ", "artist"),
+ (" Name: ", "stream_name"),
+ ("Demuxer info Name changed to ", "stream_name"),
+ ("Demuxer info Genre changed to ", "genre"),
+ ("Demuxer info Artist changed to ", "artist")
]
@@ -314,7 +312,7 @@
else:
for keywords in self.STREAM_KEYWORDS:
if line.startswith(keywords[0]):
- _debug_("stream keyword found: %s %s" % (keywords[0],
keywords[1] ))
+ _debug_("stream keyword found: %s %s" % (keywords[0],
keywords[1]))
titleStart = len(keywords[0])
self.item.info[ keywords[1] ] = line[titleStart:]
break
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
