Author: dmeyer
Date: Fri Jan 26 14:01:56 2007
New Revision: 9057
Modified:
trunk/ui/src/audio/player.py
trunk/ui/src/video/player.py
Log:
fix pause/resume
Modified: trunk/ui/src/audio/player.py
==============================================================================
--- trunk/ui/src/audio/player.py (original)
+++ trunk/ui/src/audio/player.py Fri Jan 26 14:01:56 2007
@@ -214,15 +214,14 @@
self.status = STATUS_IDLE
return True
- if event == PAUSE:
- self.player.pause()
- self.elapsed_timer.stop()
- return True
-
- if event == PLAY:
- self.player.resume()
- self.elapsed_timer.start(0.2)
- return True
+ if event in (PAUSE, PLAY):
+ if self.player.get_state() == kaa.popcorn.STATE_PLAYING:
+ self.pause()
+ return True
+ if self.player.get_state() == kaa.popcorn.STATE_PAUSED:
+ self.resume()
+ return True
+ return False
if event == SEEK:
self.player.seek(int(event.arg), kaa.popcorn.SEEK_RELATIVE)
Modified: trunk/ui/src/video/player.py
==============================================================================
--- trunk/ui/src/video/player.py (original)
+++ trunk/ui/src/video/player.py Fri Jan 26 14:01:56 2007
@@ -188,13 +188,14 @@
self.status = STATUS_IDLE
return True
- if event == PAUSE:
- self.player.pause()
- return True
-
- if event == PLAY:
- self.player.resume()
- return True
+ if event in (PAUSE, PLAY):
+ if self.player.get_state() == kaa.popcorn.STATE_PLAYING:
+ self.player.pause()
+ return True
+ if self.player.get_state() == kaa.popcorn.STATE_PAUSED:
+ self.player.resume()
+ return True
+ return False
if event == SEEK:
self.player.seek(int(event.arg), kaa.popcorn.SEEK_RELATIVE)
-------------------------------------------------------------------------
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
