Small corrections and additions to the config file.
git-svn-id: http://abcde.googlecode.com/svn/trunk@212
a0fa61bc-5347-0410-a1a9-
7f54aa4e1825
#!/bin/bash
# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
#!/bin/bash
# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
-# Copyright (c) 2003-2005 Jesus Climent <jesus.climent@hispalinux.es>
+# Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
# This code is hereby licensed for public consumption under either the
# GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
#
# 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.
#
# Copyright for this work is to expire January 1, 2010, after which it
# shall be public domain.
ARTISTFILE="$(mungefilename "$TRACKARTIST")"
ALBUMFILE="$(mungefilename "$DALBUM")"
gettracknum
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 ))
fi
OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
(( REPLAYINDEX = $REPLAYINDEX + 1 ))
gettracknum
# Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE,
# ARTISTFILE, TRACKFILE, and TRACKNUM.
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
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
# This option is basicaly for Debian package dependencies:
# List of prefered outputs - by default, run with whatever we have in the path
# 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"
# List of prefered cdromreaders - by default, run whichever we have in the path
DEFAULT_CDROMREADERS="cdparanoia cdda2wav"
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
#FLACENCODERSYNTAX=default
#SPEEXENCODERSYNTAX=default
#MPPENCODERSYNTAX=default
#FLACENCODERSYNTAX=default
#SPEEXENCODERSYNTAX=default
#MPPENCODERSYNTAX=default
+#AACENCODERSYNTAX=default
# Specify the syntax of the normalize binary here - so far only 'normalize'
# is supported.
# Specify the syntax of the normalize binary here - so far only 'normalize'
# is supported.
#FLAC=flac
#SPEEXENC=speexenc
#MPPENC=mppenc
#FLAC=flac
#SPEEXENC=speexenc
#MPPENC=mppenc
# MPPENCOPTS='--xtreme --skip 20 --fade 10'
#MPPENCOPTS=
# MPPENCOPTS='--xtreme --skip 20 --fade 10'
#MPPENCOPTS=
+# M4A/AAC
+#AACENCOPTS=
+
#ID3OPTS=
#ID3V2OPTS=
#CDPARANOIAOPTS=
#ID3OPTS=
#ID3V2OPTS=
#CDPARANOIAOPTS=
# Like OUTPUTFORMAT but for Various Artists discs.
#VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
# 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
# Define how many encoders to run at once. This makes for huge speedups
# on SMP systems. Defaults to 1. Equivalent to -j.
#MAXPROCS=2
* 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
* 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)
* 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 <jesus.climent@hispalinux.es> Thu, 23 Mar 2006 15:55:52 +0200
-- Jesus Climent <jesus.climent@hispalinux.es> Thu, 23 Mar 2006 15:55:52 +0200