From d0491de2e3e95e962fbec74c722c78c1b0a84de8 Mon Sep 17 00:00:00 2001
From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Fri, 13 Aug 2004 09:28:51 +0000
Subject: [PATCH] abcde.conf, debian/changelog  - added INTERACTIVE option, to
 force non-interactive runs abcde, debian/changelog  - added CDDB info to
 Ogg/Vorbis and FLAC

git-svn-id: http://abcde.googlecode.com/svn/trunk@13 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---
 abcde            | 4 +++-
 abcde.conf       | 5 +++++
 debian/changelog | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/abcde b/abcde
index 7f8de6a..97168a2 100755
--- a/abcde
+++ b/abcde
@@ -303,6 +303,7 @@ do_tag ()
 					echo GENRE="$CDGENRE"
 		                fi	
 				echo TRACKNUMBER=$1
+				echo CDDB=$CDDBDISCID
 				if [ "$(eval echo ${COMMENT})" != "" ]; then
 					case "$COMMENTOUTPUT" in
 						*=*) echo "$COMMENTOUTPUT";;
@@ -331,13 +332,14 @@ do_tag ()
                	if [ -n "$CDGENRE" ]; then
 			echo GENRE="$CDGENRE"
                 fi	
+		echo TRACKNUMBER=$1
+		echo CDDB=$CDDBDISCID
 		if [ "$(eval echo ${COMMENT})" != "" ]; then
 			case "$COMMENTOUTPUT" in
 				*=*) echo "$COMMENTOUTPUT";;
 				*)   echo COMMENT="$COMMENTOUTPUT";;
 			esac	
 		fi
-		echo TRACKNUMBER=$1
                 ) | run_command tagtrack-$1 $METAFLAC --import-vc-from=- --no-utf8-convert "$ABCDETEMPDIR/track$1.$OUTPUT"
 		;;
 	spx)
diff --git a/abcde.conf b/abcde.conf
index 1dbe231..f664816 100644
--- a/abcde.conf
+++ b/abcde.conf
@@ -61,6 +61,11 @@
 # 01.my_song.ext
 #PADTRACKS=n
 
+# Define if you want abcde to be non-interactive.
+# Keep in mind that there is no way to deactivate it right now in the command
+# line, so setting this option makes abcde to be always non-interactive.
+#INTERACTIVE=n
+
 # Specify 'nice'ness of the encoder, the CD reader and the distmp3 proc.
 # This is a relative 'nice'ness (that is, if the parent process is at a
 # nice level of 12, and the ENCNICE is set to 3, then the encoder will
diff --git a/debian/changelog b/debian/changelog
index b5c2f41..969d3b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,11 @@ abcde (2.1.20-2.2pre2-1) experimental; urgency=low
   * Examples added to the tarball and /usr/share/doc/abcde/examples with two
     scripts to make abcde kind-of-a ripper daemon.
   * Changed to experimental to have an stable 2.1.20 version in Sarge.
+  * Add CDDB information to Ogg/Vorbis and FLAC files (Closes: #265358).
+  * Added INTERACTIVE option. Set it to "n" and there you go, without user
+    interaction.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 30 Jul 2004 18:27:22 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 13 Aug 2004 12:27:33 +0300
 
 abcde (2.1.19-1) unstable; urgency=low
 
-- 
2.20.1