#
# $Id$
-VERSION='2.5.1-UNRELEASED'
+VERSION='2.5.3-UNRELEASED'
usage ()
{
echo "-k Keep the wav tracks for later use"
echo "-l Use low disk space algorithm"
echo "-L Use local CDDB storage directory"
-echo "-n No lookup. Don't query CDDB, just create and use template"
-echo "-N Noninteractive. Never prompt for anything"
echo "-m Modify playlist to include CRLF endings, to comply with some players"
#echo " WARNING: Deprecated. Use \"cue\" action"
#echo "-M Create a CUE file"
+echo "-n No lookup. Don't query CDDB, just create and use template"
+echo "-N Noninteractive. Never prompt for anything"
echo "-o <type1[,type2]...>"
echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a). Defaults to vorbis"
echo "-p Pad track numbers with 0's (if less than 10 tracks)"
done
echo
else
- log error "syntax error while processing track numbers"
+ log error "syntax error while processing track numbers ($i)"
exit 1
fi
}
TEMPARG="PIPE_$MPPENCODER"
;;
m4a)
- TEMPARG="PIPE_$MPPENCODER"
+ TEMPARG="PIPE_$AACENCODERSYNTAX"
;;
esac
IN="$( eval echo "\$$TEMPARG" )"
fi
# Tag the file at encode time, as it can't be done after encoding.
if [ "$DOTAG" = "y" ]; then
- RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
fi
fi
}
+# do_cdtext
+# Try to read CD-Text from the drive using icedax / cdda2wav
+do_cdtext ()
+{
+ if new_checkexec icedax; then
+ CDTEXT_READER=icedax
+ elif new_checkexec cdda2wav; then
+ CDTEXT_READER=cdda2wav
+ else
+ # Didn't find either, bail
+ return 0
+ fi
+
+ if [ "$CDROMID" = "" ]; then
+ CDDA2WAVCDROM="$CDROM"
+ else
+ CDDA2WAVCDROM="$CDROMID"
+ fi
+
+ # Do we have CD-Text on the disc (and can the drive read it?)
+ ${CDTEXT_READER} -J -N -D ${CDDA2WAVCDROM} > $ABCDETEMPDIR/cd-text 2>&1
+ grep -q '^CD-Text: detected' $ABCDETEMPDIR/cd-text
+ ERRORCODE=$?
+ if [ $ERRORCODE -ne 0 ]; then
+ # No CD-Text found, bail
+ return 0
+ fi
+
+ rm -f "$ABCDETEMPDIR/cddbchoices"
+ CDDBCHOICES=1
+ # Make an empty template
+ $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
+ echo -n "Retrieved 1 CD-Text match..." >> "$ABCDETEMPDIR/cddbchoices"
+ echo "done." >> "$ABCDETEMPDIR/cddbchoices"
+ echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
+ echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
+ ATITLE=$(grep -e '^Album title:' ${ABCDETEMPDIR}/cd-text | cut -c14- )
+ echo "200 none ${ATITLE}" >> "$ABCDETEMPDIR/cddbquery"
+ # List out disc title/author and contents
+ echo ---- ${ATITLE} ---- >> "$ABCDETEMPDIR/cddbchoices"
+ for TRACK in $(f_seq_row 1 $TRACKS)
+ do
+ TRACKM1=$(($TRACK - 1))
+ TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")"
+ echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
+ sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" $ABCDETEMPDIR/cddbread.1
+ done
+ sed -i "s~^DTITLE=.*~DTITLE=${ATITLE}~" $ABCDETEMPDIR/cddbread.1
+ echo >> "$ABCDETEMPDIR/cddbchoices"
+ echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status"
+}
+
# do_musicbrainz
# Work with the musicbrainz WS API, then transform the results here so
# they look (very) like the results from CDDB. Maybe not the best way
# Range parsing code courtesy of Vincent Ho
# Cleaned up to use shell built-ins by Charles Steinkuehler
if [ "${1#*[^0-9-]}" != "$1" ]; then
- log error "syntax error while processing track numbers"
+ log error "syntax error while processing track numbers ($1)"
+ exit 1
else
RSTART=${1%%-*}
REND=${1##*-}
;;
esac
fi
+ CHOICE=$(checkstatus cddb-choice)
+ if [ $CHOICE = 0 ] ; then
+ # We don't have any information at all; try to fall back
+ # to CD-Text for basic information
+ vecho "No CDDB information found, trying cdtext from the CD"
+ do_cdtext
+ fi
fi
do_cddbedit