Author: dmeyer
Date: Mon Oct 15 13:43:47 2007
New Revision: 9986
Log:
set last_played only for items that support this
Modified:
trunk/ui/src/audio/audioitem.py
trunk/ui/src/image/imageitem.py
trunk/ui/src/menu/mediaitem.py
trunk/ui/src/video/videoitem.py
Modified: trunk/ui/src/audio/audioitem.py
==============================================================================
--- trunk/ui/src/audio/audioitem.py (original)
+++ trunk/ui/src/audio/audioitem.py Mon Oct 15 13:43:47 2007
@@ -43,6 +43,7 @@
# freevo imports
from freevo.ui.menu import MediaItem, Action
+from freevo.ui.event import PLAY_END, STOP
# audio player
import player as audioplayer
@@ -58,6 +59,7 @@
def __init__(self, url, parent):
MediaItem.__init__(self, parent)
+ self.user_stop = False
self.set_url(url)
@@ -105,3 +107,16 @@
Stop the current playing
"""
audioplayer.stop()
+
+
+ def eventhandler(self, event):
+ """
+ eventhandler for this item
+ """
+ if event == STOP:
+ self.user_stop = True
+ if event == PLAY_END:
+ if not self.user_stop:
+ self['last_played'] = int(time.time())
+ self.user_stop = False
+ return MediaItem.eventhandler(self, event)
Modified: trunk/ui/src/image/imageitem.py
==============================================================================
--- trunk/ui/src/image/imageitem.py (original)
+++ trunk/ui/src/image/imageitem.py Mon Oct 15 13:43:47 2007
@@ -40,6 +40,7 @@
# freevo imports
from freevo.ui import config
from freevo.ui.menu import MediaItem, Action
+from freevo.ui.event import PLAY_END, STOP
from viewer import viewer
class ImageItem(MediaItem):
@@ -50,6 +51,7 @@
def __init__(self, url, parent, duration = config.image.viewer.duration):
MediaItem.__init__(self, parent)
+ self.user_stop = False
# set url and parse the name
self.set_url(url)
self.duration = duration
@@ -99,3 +101,16 @@
Stop viewing this item
"""
viewer.stop()
+
+
+ def eventhandler(self, event):
+ """
+ eventhandler for this item
+ """
+ if event == STOP:
+ self.user_stop = True
+ if event == PLAY_END:
+ if not self.user_stop:
+ self['last_played'] = int(time.time())
+ self.user_stop = False
+ return MediaItem.eventhandler(self, event)
Modified: trunk/ui/src/menu/mediaitem.py
==============================================================================
--- trunk/ui/src/menu/mediaitem.py (original)
+++ trunk/ui/src/menu/mediaitem.py Mon Oct 15 13:43:47 2007
@@ -62,7 +62,6 @@
self.filename = None
self.fxdinfo = {}
self.elapsed = 0
- self.user_stop = False
def set_url(self, url):
@@ -217,16 +216,3 @@
Stop playing
"""
pass
-
-
- def eventhandler(self, event):
- """
- eventhandler for this item
- """
- if event == STOP:
- self.user_stop = True
- if event == PLAY_END:
- if not self.user_stop:
- self['last_played'] = int(time.time())
- self.user_stop = False
- return Item.eventhandler(self, event)
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Mon Oct 15 13:43:47 2007
@@ -49,7 +49,7 @@
from freevo.ui.application import MessageWindow, ConfirmWindow
from freevo.ui.menu import Menu, MediaItem, Files, Action
-from freevo.ui.event import PLAY_END
+from freevo.ui.event import PLAY_END, STOP
# video imports
import configure
@@ -70,6 +70,7 @@
def __init__(self, url, parent):
MediaItem.__init__(self, parent)
+ self.user_stop = False
self.subtitle_file = {} # text subtitles
self.audio_file = {} # audio dubbing
@@ -224,3 +225,16 @@
stop playing
"""
videoplayer.stop()
+
+
+ def eventhandler(self, event):
+ """
+ eventhandler for this item
+ """
+ if event == STOP:
+ self.user_stop = True
+ if event == PLAY_END:
+ if not self.user_stop:
+ self['last_played'] = int(time.time())
+ self.user_stop = False
+ return MediaItem.eventhandler(self, event)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
