Added DISCNUMBER to Ogg/Vorbis and FLAC

git-svn-id: http://abcde.googlecode.com/svn/trunk@235 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index da550a2..5c934ce 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -847,6 +847,9 @@ do_tag ()
                                                echo GENRE="$CDGENRE"
                                        fi      
                                        echo TRACKNUMBER=${TRACKNUM:-$1}
+                                       if [ -n "$DISCNUMBER" ]; then
+                                               echo DISCNUMBER="$DISCNUMBER"
+                                       fi
                                        echo CDDB=$CDDBDISCID
                                        if [ "$(eval echo ${COMMENT})" != "" ]; then
                                                case "$COMMENTOUTPUT" in
@@ -879,6 +882,9 @@ do_tag ()
                                echo GENRE="$CDGENRE"
                        fi      
                        echo TRACKNUMBER="${TRACKNUM:-$1}"
+                       if [ -n "$DISCNUMBER" ]; then
+                               echo DISCNUMBER="$DISCNUMBER"
+                       fi
                        echo CDDB="$CDDBDISCID"
                        if [ "$(eval echo ${COMMENT})" != "" ]; then
                                case "$COMMENTOUTPUT" in
@@ -3170,7 +3176,10 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
                X) CUE2DISCID="$OPTARG" ;;
                w) COMMENT="$OPTARG" ;;
                W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then 
-                    STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
+                    STARTTRACKNUMBER="${OPTARG}01"
+                        STARTTRACKNUMBERTAG="y"
+                        COMMENT="CD${OPTARG}"
+                        DISCNUMBER="${OPTARG}"
                   else
                     log error "argument of -W must be integer"
                         exit 1

diff --git a/abcde.1 b/abcde.1
index 83a682b..eea08ad 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -203,7 +203,8 @@ Add a comment to the tracks ripped from the CD.
 .TP
 .B \-W [number]
 Concatenate CD\'s. It uses the number provided to define a comment "CD #" and
-to modify the numbering of the tracks, starting with "#01".
+to modify the numbering of the tracks, starting with "#01". For Ogg/Vorbis and 
+FLAC files, it also defines a DISCNUMBER tag.
 .TP
 .B \-z
 DEBUG mode: it will rip, using cdparanoia, the very first second of each track

diff --git a/debian/changelog b/debian/changelog
index 9bbaf3e..d892280 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 abcde (2.3.99.7-1) unstable; urgency=low
 
+  * The "It took me one year to get this release out" release.
   * abcde.1: remove -M in favour of "-a cue" (Closes: #382614, #396505).
   * Added a check for a DOCUE already set in the command line
     (Closes: #385663).
@@ -19,8 +20,9 @@ abcde (2.3.99.7-1) unstable; urgency=low
     Steinkuehler) (Closes: #395108).
   * Corrected man page wrapping. Thanks to Edward J. Shornock
     (Closes: #399289).
+  * Adds DISCNUMBER to Ogg/Vorbis and FLAC when using -W.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Sun, 19 Nov 2006 14:36:07 +0200
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 07 Jun 2007 10:29:54 +0300
 
 abcde (2.3.99.6-1) unstable; urgency=low