case "$2" in
%local*%)
case "$FLACENCODERSYNTAX" in
- flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;;
+ flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f ${IMPORTCUESHEET:+--cuesheet="$ABCDETEMPDIR/$CUEFILE"} $FLACENCODEROPTS -o "$OUT" "$IN" ;;
esac
;;
*)
single)
# List out disc title/author and contents
do_cddbparse "${CDDBLOCALFILE}"
- echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
+ if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+ echo -n "Embedded cuesheet entry found, use ut? [y/n] (y): " >&2
+ else
+ echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
+ fi
if [ "$INTERACTIVE" = "y" ]; then
read USELOCALRESP
while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do
### FIXME ### use an exception for flac, since it uses -o
### FIXME ### Shall we just use -o $FILEARG ??
flac)
- nice $READNICE $FLAC -d --cue=${READTRACKNUMS:-$UTRACKNUM.1-$(($UTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;;
+ # Avoid problems wit math expressions by unpadding the given UTRACKNUM
+ STRIPTRACKNUM=$(expr $UTRACKNUM + 0)
+ nice $READNICE $FLAC -d -f --cue=${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;;
cdparanoia)
echo "nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;" > /tmp/log
nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
{
if [ x"$EXTRAVERBOSE" != "x" ]; then
case $1 in
- warning) log warning "$@" ;;
+ warning) shift ; log warning "$@" ;;
*) echo "$@" ;;
esac
fi
# If the user specified a flac file, then switch to special flac mode
if echo $CDROM | grep -i -q '.flac$'; then
- vecho "abcde: switching to flac CDROMREADERSYNTAX..."
+ vecho warning "abcde: switching to flac CDROMREADERSYNTAX..."
CDROMREADERSYNTAX=flac
+ # Added a need on CUE2DISCID until we manage to convert the python script to bash.
+ NEEDCUE2DISCID=y
if [ "$EJECTCD" = "y" ];then
vecho "abcde: CDROM flac mode, deactivating EJECTCD..."
EJECTCD=n
fi
# If the user provided a DISCID, disable eject
-if [ -n "$DISCID" ]; then EJECTCD=n ; fi
+if [ -n "$DISCID" ] || [ "$CDROMREADERSYNTAX" = "flac" ]; then EJECTCD=n ; fi
# Check the available cd rippers in the system, from the ones we know.
if [ "$CDROMREADERSYNTAX" = "" ]; then
[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
+ if [ "$ONETRACK" = "y" ]; then
+ [ "$MAKECUEFILE" = "y" ] && IMPORTCUESHEET=y
+ fi
;;
spx)
[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
fi
if [ "$ONETRACK" = "y" ]; then
+ # Reuse the CUEFILE in case we created it in a previous run
+ if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
+ IMPORTCUESHEET=y
+ fi
TRACKS="$FIRSTTRACK"
if checkstatus readtrack-$FIRSTTRACK; then :; else
if [ "$USEPIPES" = "y" ]; then