From 56672932c9ab0f47d825df7d3856162b3442e390 Mon Sep 17 00:00:00 2001 From: data Date: Sun, 2 Apr 2006 13:37:20 +0000 Subject: [PATCH 1/1] Applied some more patches. Small corrections and additions to the config file. git-svn-id: http://abcde.googlecode.com/svn/trunk@212 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 45 +++++++++++++++++++++++++++++++-------------- abcde.conf | 9 +++++++++ debian/changelog | 7 ++++++- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/abcde b/abcde index 39e678d..7a7eab1 100755 --- a/abcde +++ b/abcde @@ -1,12 +1,12 @@ #!/bin/bash # Copyright (c) 1998-2001 Robert Woodcock -# Copyright (c) 2003-2005 Jesus Climent +# Copyright (c) 2003-2006 Jesus Climent # This code is hereby licensed for public consumption under either the # GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # Copyright for this work is to expire January 1, 2010, after which it # shall be public domain. @@ -453,10 +453,18 @@ do_replaygain() ARTISTFILE="$(mungefilename "$TRACKARTIST")" ALBUMFILE="$(mungefilename "$DALBUM")" gettracknum - if [ "$VARIOUSARTISTS" = "y" ]; then - OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT\"")" - else - OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT\"")" + if [ "$ONETRACK" = "y" ]; then + if [ "$VARIOUSARTISTS" = "y" ]; then + OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")" + else + OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")" + fi + else + if [ "$VARIOUSARTISTS" = "y" ]; then + OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")" + else + OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")" + fi fi OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" (( REPLAYINDEX = $REPLAYINDEX + 1 )) @@ -1241,11 +1249,19 @@ do_move () gettracknum # Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE, # ARTISTFILE, TRACKFILE, and TRACKNUM. - if [ "$VARIOUSARTISTS" = "y" ]; then - OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT\"")" - else - OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT\"")" - fi + if [ "$ONETRACK" = "y" ]; then + if [ "$VARIOUSARTISTS" = "y" ]; then + OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")" + else + OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")" + fi + else + if [ "$VARIOUSARTISTS" = "y" ]; then + OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")" + else + OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")" + fi + fi if checkerrors "tagtrack-$OUTPUT-$1"; then :; else # Once we know the specific output was successful, we can change # the OUTPUT to the value containing the container @@ -2711,7 +2727,7 @@ ACTIONS=cddb,read,encode,tag,move,clean # This option is basicaly for Debian package dependencies: # List of prefered outputs - by default, run with whatever we have in the path -DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex +DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac # List of prefered cdromreaders - by default, run whichever we have in the path DEFAULT_CDROMREADERS="cdparanoia cdda2wav" @@ -3384,6 +3400,7 @@ fi # Make sure a buncha things exist for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ $OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \ + $AACENCODER \ ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \ ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \ ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \ diff --git a/abcde.conf b/abcde.conf index 8a7fcda..cb75990 100644 --- a/abcde.conf +++ b/abcde.conf @@ -63,6 +63,7 @@ #FLACENCODERSYNTAX=default #SPEEXENCODERSYNTAX=default #MPPENCODERSYNTAX=default +#AACENCODERSYNTAX=default # Specify the syntax of the normalize binary here - so far only 'normalize' # is supported. @@ -113,6 +114,7 @@ #FLAC=flac #SPEEXENC=speexenc #MPPENC=mppenc +#AACENC=faac #ID3=id3 #ID3V2=id3v2 @@ -169,6 +171,9 @@ # MPPENCOPTS='--xtreme --skip 20 --fade 10' #MPPENCOPTS= +# M4A/AAC +#AACENCOPTS= + #ID3OPTS= #ID3V2OPTS= #CDPARANOIAOPTS= @@ -233,6 +238,10 @@ # Like OUTPUTFORMAT but for Various Artists discs. #VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' +# Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips. +#ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT +#VAONETRACKOUTPUTFORMAT=$VAOUTPUTFORMAT + # Define how many encoders to run at once. This makes for huge speedups # on SMP systems. Defaults to 1. Equivalent to -j. #MAXPROCS=2 diff --git a/debian/changelog b/debian/changelog index 32623da..409ab71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,13 @@ abcde (2.3.99.6-1) unstable; urgency=low * Added a missing "INDEX 01" entry for CUE sheet creation. * Avoid completing the encoding of files if we aborted previously. * Embed the CUE sheet if we have a cuesheet file and we have a single FLAC - file, even if we are not tagging. + file, even if we are not tagging. This way we can use the file as a source + even if it is not tagged/named properly. * Fails to quote filenames properly (Closes: #355296) + * Introduced VA/ONETRACKOUTPUTFORMAT. + * Added a missing check for AACENCODER. + * Updated config file with some new AAC bits. + * Updated FSF address. -- Jesus Climent Thu, 23 Mar 2006 15:55:52 +0200 -- 2.20.1