Author: duncan
Date: Mon Nov 5 15:29:00 2007
New Revision: 10083
Log:
Merged changed from rel-1
Added:
branches/rel-1-7/freevo/src/video/plugins/mplayer_autoaspect.py
- copied unchanged from r10079,
/branches/rel-1/freevo/src/video/plugins/mplayer_autoaspect.py
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/plugins/freevoscreensaver.py
branches/rel-1-7/freevo/src/video/videoitem.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/video/videoitem.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Mon Nov 5 15:29:00 2007
@@ -26,6 +26,7 @@
* New fxd archive plug-in (F#1826280)
* New internet TV plug-in (F#1811634)
* New lastfm menu plug-in (F#1792494)
+ * New mplayer aspect plug-in to force the aspect ratio (F#1825484)
* New RSS audio podcast plug-in (F#1807634)
* New RSS video podcast plug-in (F#1825640)
* New text entry and program search (F#1768790)
Modified: branches/rel-1-7/freevo/src/plugins/freevoscreensaver.py
==============================================================================
--- branches/rel-1-7/freevo/src/plugins/freevoscreensaver.py (original)
+++ branches/rel-1-7/freevo/src/plugins/freevoscreensaver.py Mon Nov 5
15:29:00 2007
@@ -35,6 +35,7 @@
import plugin
from playlist import Playlist
import rc
+import osd
import event as em
import fxditem
@@ -90,6 +91,7 @@
self.saver_type = sstype
self.arg1 = ssarg1
self.arg2 = ssarg2
+ self.osd = osd.get_singleton()
def config(self):
return [ ('SSAVER_DELAY', 300, '# of seconds to wait to start saver.'),
@@ -169,3 +171,6 @@
rc.post_event(em.STOP)
else:
_debug_("Unknown saver type to stop.")
+
+ time.sleep(1)
+ self.osd.update()
Modified: branches/rel-1-7/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/videoitem.py (original)
+++ branches/rel-1-7/freevo/src/video/videoitem.py Mon Nov 5 15:29:00 2007
@@ -56,7 +56,7 @@
self.autovars = []
Item.__init__(self, parent)
self.type = 'video'
-
+
self.variants = [] # if this item has variants
self.subitems = [] # more than one file/track to play
self.current_subitem = None
@@ -83,8 +83,8 @@
self.set_url(url, info=parse)
if info:
self.info.set_variables(info)
-
-
+
+
# deinterlacing and related things
video_deinterlace = config.VIDEO_DEINTERLACE != None and
config.VIDEO_DEINTERLACE or False
self['deinterlace'] = video_deinterlace
@@ -94,7 +94,7 @@
video_field_dominance = config.VIDEO_FIELD_DOMINANCE != None and
config.VIDEO_FIELD_DOMINANCE or False
self['field-dominance'] = video_field_dominance
-
+
# find image for tv show and build new title
if config.VIDEO_SHOW_REGEXP_MATCH(self.name) and not self.network_play
and \
config.VIDEO_SHOW_DATA_DIR:
@@ -202,7 +202,7 @@
self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
if len(self.possible_player) > 0:
self.player_rating, self.player = self.possible_player[0]
-
+
def id(self):
@@ -242,6 +242,19 @@
if aspect:
return aspect
+ if key == 'mplayer_aspect':
+ aspect = None
+ if self.info['aspect']:
+ aspect = str(self.info['aspect'])
+ aspect[:aspect.find(' ')].replace('/', ':')
+ else:
+ if self.info['width'] and self.info['height']:
+ ratio = float(self.info['width']) / self.info['height']
+ aspect = "%f" % ratio
+
+ if aspect:
+ return aspect
+
if key == 'runtime':
if self.info['runtime']:
@@ -302,7 +315,7 @@
"""
if not self.possible_player:
return []
-
+
if self.url.startswith('dvd://') and self.url[-1] == '/':
if self.player_rating >= 20:
items = [ (self.play, _('Play DVD')),
@@ -376,7 +389,7 @@
"""
self.play(menuw=menuw, arg='-cache 65536')
-
+
def play_alternate(self, arg=None, menuw=None):
"""
play and use maximum cache with mplayer
@@ -445,11 +458,11 @@
"""
if not self.possible_player:
return
-
+
# execute commands if defined
if config.VIDEO_PRE_PLAY:
os.system(config.VIDEO_PRE_PLAY)
-
+
# FIXME: There could be more than two players available
if alternateplayer:
self.possible_player.reverse()
@@ -500,9 +513,8 @@
elif not result:
# No media at all was found: error
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) %
- self.name, handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease insert
the media "%s".')) %
+ (self.name, self.media_id), handler=self.play).show()
return
# normal plackback of one file
@@ -514,9 +526,8 @@
util.mount(mountdir)
else:
self.menuw.show()
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) % file,
- handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease
insert the media "%s".')) % \
+ (file, self.media_id), handler=self.play).show()
return
elif self.media:
@@ -528,9 +539,8 @@
self.media = media
else:
self.menuw.show()
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) % self.url,
- handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease insert
the media "%s".')) % \
+ (self.media_id, self.url), handler=self.play).show()
return
elif self.mode in ('http') and not self.filename and not self.media:
self.player_rating, self.player = self.possible_player[0]
@@ -629,7 +639,7 @@
i.name = Unicode(_('Play Title %d') % (titlenum+1))
items.append(i)
-
+
moviemenu = menu.Menu(self.name, items, umount_all = 1,
fxd_file=self.skin_fxd)
moviemenu.item_types = 'video'
self.menuw.pushmenu(moviemenu)
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Mon Nov 5 15:29:00 2007
@@ -17,7 +17,6 @@
--------------------------------
* New changed the event and timer handling to use kaa notifier and kaa rpc
- * New mplayer aspect plug-in to force the aspect ratio (F#1825484)
== Release 1.7.4 (2007-11-15) ==
--------------------------------
@@ -32,6 +31,7 @@
* New fxd archive plug-in (F#1826280)
* New internet TV plug-in (F#1811634)
* New lastfm menu plug-in (F#1792494)
+ * New mplayer aspect plug-in to force the aspect ratio (F#1825484)
* New RSS audio podcast plug-in (F#1807634)
* New RSS video podcast plug-in (F#1825640)
* New text entry and program search (F#1768790)
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Mon Nov 5 15:29:00 2007
@@ -513,9 +513,8 @@
elif not result:
# No media at all was found: error
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) %
- self.name, handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease insert
the media "%s".')) %
+ (self.name, self.media_id), handler=self.play).show()
return
# normal plackback of one file
@@ -527,9 +526,8 @@
util.mount(mountdir)
else:
self.menuw.show()
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) % file,
- handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease
insert the media "%s".')) % \
+ (file, self.media_id), handler=self.play).show()
return
elif self.media:
@@ -541,9 +539,8 @@
self.media = media
else:
self.menuw.show()
- ConfirmBox(text=(_('No media found for "%s".\n')+
- _('Please insert the media.')) % self.url,
- handler=self.play).show()
+ ConfirmBox(text=(_('No media found for "%s".\nPlease insert
the media "%s".')) % \
+ (self.media_id, self.url), handler=self.play).show()
return
elif self.mode in ('http') and not self.filename and not self.media:
self.player_rating, self.player = self.possible_player[0]
-------------------------------------------------------------------------
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
