Author: duncan
Date: Wed Nov 29 21:52:06 2006
New Revision: 8677
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/audio/audioitem.py
branches/rel-1/freevo/src/util/misc.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 Wed Nov 29 21:52:06 2006
@@ -16,7 +16,8 @@
svn export svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
-The release date is only tentative at the moment. This release has all the
changes in Release 1.6.1 plus
+The release date is only tentative at the moment.
+This release has all the changes in Release 1.6.x plus
* Replaced mmpython with kaa.base and kaa.metadata (F#1580712)
* New apple trailers plugin (disabled by default) (F#1580418)
@@ -33,6 +34,11 @@
* Updated multimail plug-in for Maildir support (F#1594915)
* Updated recordserver to allow automatic deleting of old recordings when low
on disk space (F#1594630)
+== Release 1.6.2 (2006-??-??) ==
+--------------------------------
+
+ * Fixed audio track name formatting (B#1605570,B#1605042)
+
== Release 1.6.1 (2006-11-25) ==
--------------------------------
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Wed Nov 29 21:52:06 2006
@@ -1387,8 +1387,8 @@
# Xine settings:
# ======================================================================
-# You need xine-ui version greater 0.9.21 to use the all the features
-# of the xine plugin
+# You need xine-ui version greater or equal to 0.9.23 to use the all the
+# features of the xine plugin
XINE_COMMAND = ''
Modified: branches/rel-1/freevo/src/audio/audioitem.py
==============================================================================
--- branches/rel-1/freevo/src/audio/audioitem.py (original)
+++ branches/rel-1/freevo/src/audio/audioitem.py Wed Nov 29 21:52:06 2006
@@ -54,7 +54,9 @@
self.set_url(url, info=scan)
if name:
- self.name = name
+ self.name = name
+ else:
+ self.name = self.format_track()
self.start = 0
self.elapsed = 0
@@ -178,7 +180,7 @@
def format_track(self):
- """ Return a formatted string for use in music.py """
+ """ Return a formatted string for use in item.py """
# Since we can't specify the length of the integer in the
# format string (Python doesn't seem to recognize it) we
# strip it out first, when we see the only thing that can be
@@ -187,20 +189,20 @@
# Before we begin, make sure track is an integer
- if self.track:
+ if self['trackno']:
try:
- mytrack = ('%0.2d' % int(self.track))
+ mytrack = ('%0.2d' % int(self['trackno']))
except ValueError:
- mytrack = None
+ mytrack = None
else:
- mytrack = None
-
- song_info = { 'a' : self.artist,
- 'l' : self.album,
+ mytrack = None
+
+ song_info = { 'a' : self['artist'],
+ 'l' : self['album'],
'n' : mytrack,
- 't' : self.title,
- 'y' : self.year,
- 'f' : self.name }
+ 't' : self['title'],
+ 'y' : self['year'],
+ 'f' : self['name'] }
if self.parent and hasattr(self.parent, 'AUDIO_FORMAT_STRING'):
return self.parent.DIRECTORY_AUDIO_FORMAT_STRING % song_info
Modified: branches/rel-1/freevo/src/util/misc.py
==============================================================================
--- branches/rel-1/freevo/src/util/misc.py (original)
+++ branches/rel-1/freevo/src/util/misc.py Wed Nov 29 21:52:06 2006
@@ -383,7 +383,6 @@
replacement = e[entity[1:-1]]
except KeyError:
continue
- #string = string.replace(entity, replacement)
string = string.replace(entity, replacement.decode("latin-1"))
return string
-------------------------------------------------------------------------
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
