Author: duncan
Date: Tue Dec 19 23:16:46 2006
New Revision: 8748
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/plugins/autoshutdown.py
branches/rel-1/freevo/src/video/plugins/mplayer.py
Log:
Merged changes from rel-1-6
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Tue Dec 19 23:16:46 2006
@@ -43,7 +43,9 @@
--------------------------------
* Fixed audio track name formatting (B#1605570,B#1605042)
+ * Fixed autoshutdown unicode error (B#1612257)
* Fixed cdbackup plug-in to correctly execute lame (B#1615970)
+ * Fixed mplayer to correctly handle Matroska audio ids (B#1619058)
* Fixed weather unicode problem (B#1612617)
* Updated autoshutdown to react to the return code and removed unused vars
(B#1612257)
* Updated osd forced fonts variables and freevo_config and local_conf
(B#1608393)
Modified: branches/rel-1/freevo/src/plugins/autoshutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/autoshutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/autoshutdown.py Tue Dec 19 23:16:46 2006
@@ -156,7 +156,7 @@
except ExNoWakeupNeeded:
msg = _("No wakeup scheduled.")
else:
- next_msg = time.strftime( config.TV_DATETIMEFORMAT,
time.localtime(next))
+ next_msg = Unicode(time.strftime(
config.TV_DATETIMEFORMAT, time.localtime(next)))
next_min = int((next - time.time()) / 60)
msg = _("The next wakeup is scheduled at") + "\n" +
next_msg
else:
Modified: branches/rel-1/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/video/plugins/mplayer.py Tue Dec 19 23:16:46 2006
@@ -189,8 +189,11 @@
elif item.selected_subtitle:
additional_args += [ '-sid', str(item.selected_subtitle) ]
- if item.selected_audio != None:
- additional_args += [ '-aid', str(item.selected_audio) ]
+ if item.selected_audio:
+ if item.mimetype == 'mkv':
+ additionnal_args += [ '-aid', str(item.selected_audio-1) ]
+ else:
+ additionnal_args += [ '-aid', str(item.selected_audio) ]
if item['deinterlace'] and config.MPLAYER_VF_INTERLACED:
additional_args += [ '-vf', config.MPLAYER_VF_INTERLACED ]
-------------------------------------------------------------------------
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
