Merge branch 'master' of gitorious.org:atom/atom

This commit is contained in:
Vincent Riquer 2013-03-06 22:44:56 +01:00
commit b148bf331f

9
atom
View File

@ -669,7 +669,12 @@ getInfos::Ogg() {
genre=$(gettag genre) genre=$(gettag genre)
performer=$(gettag performer) performer=$(gettag performer)
title=$(gettag title) title=$(gettag title)
tracknum="$(gettag tracknumber)/$(gettag tracktotal)" tracknum=$(gettag tracknumber)
tracktotal=$(gettag tracktotal)
if [ -n "$tracknum" -a -n "$tracktotal" ]
then
tracknum="$tracknum/$tracktotal"
fi
year=$(gettag date) year=$(gettag date)
[ -n "$album" \ [ -n "$album" \
-o -n "$albumartist" \ -o -n "$albumartist" \
@ -1006,7 +1011,7 @@ do
album \ album \
disc \ disc \
artist \ artist \
track \ tracknum \
title \ title \
composer \ composer \
performer performer