Changeset 1861
- Timestamp:
- 04/11/08 20:03:24 (2 months ago)
- svm:headrev:
cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11143- Location:
- freevo/src/audio
- Files:
-
- 2 modified
-
player.py (modified) (2 diffs)
-
plugins/mplayer.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
freevo/src/audio/player.py
r1824 r1861 131 131 132 132 @benchmark(benchmarking, benchmarkcall) 133 def stop(self ):133 def stop(self, restore_menu=False): 134 134 global _player_ 135 135 _player_ = None … … 140 140 rc.app(None) 141 141 142 if self.menuw and not self.menuw.visible :142 if self.menuw and not self.menuw.visible and restore_menu: 143 143 self.menuw.show() 144 144 -
freevo/src/audio/plugins/mplayer.py
r1852 r1861 177 177 self.item = item 178 178 179 #print 'DJW:command:', ' '.join(command)180 179 self.app = MPlayerApp(command, self) 181 180 return None … … 209 208 if p.eventhandler(event): 210 209 return True 210 211 if event == AUDIO_SEND_MPLAYER_CMD: 212 self.app.write('%s\n' % event.arg) 213 return True 211 214 212 215 if event == PLAY_END and event.arg: … … 214 217 if self.playerGUI.try_next_player(): 215 218 return True 216 217 if event == AUDIO_SEND_MPLAYER_CMD:218 self.app.write('%s\n' % event.arg)219 return True220 219 221 220 if event in (STOP, PLAY_END, USER_END):
