projects
/
abcde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
22f8c9e
)
Tagged 2.3.99.3
author
Jesus Climent
<mooch@debian.org>
Thu, 26 Jan 2006 20:56:04 +0000
(20:56 +0000)
committer
Jesus Climent
<mooch@debian.org>
Thu, 26 Jan 2006 20:56:04 +0000
(20:56 +0000)
abcde
patch
|
blob
|
history
diff --git
a/abcde
b/abcde
index
9367555
..
27779b1
100755
(executable)
--- a/
abcde
+++ b/
abcde
@@
-413,15
+413,18
@@
do_replaygain()
{
if checkstatus replaygain; then :; else
run_command "" echo "Adding replygain information..."
{
if checkstatus replaygain; then :; else
run_command "" echo "Adding replygain information..."
- for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
+ for
TMP
OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
do
do
- case $OUTPUT in
+ case $
TMP
OUTPUT in
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
+ *)
+ OUTPUT=$TMPOUTPUT
+ ;;
esac
OUTPUTFILES=""
REPLAYINDEX=0
esac
OUTPUTFILES=""
REPLAYINDEX=0
@@
-894,9
+897,9
@@
do_encode ()
fi
# We need IN to proceed, if we are not using pipes.
if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
fi
# We need IN to proceed, if we are not using pipes.
if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+ for
TMP
OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
do
- case "$OUTPUT" in
+ case "$
TMP
OUTPUT" in
vorbis|ogg)
OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
OUTPUT=$OGGOUTPUTCONTAINER
vorbis|ogg)
OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
OUTPUT=$OGGOUTPUTCONTAINER
@@
-907,6
+910,7
@@
do_encode ()
;;
*)
OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
;;
*)
OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
+ OUTPUT=$TMPOUTPUT
;;
esac
if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then
;;
esac
if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then
@@
-1292,15
+1296,18
@@
do_move ()
# VARIOUSARTISTS, OUTPUTDIR
do_playlist ()
{
# VARIOUSARTISTS, OUTPUTDIR
do_playlist ()
{
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+ for
TMP
OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
do
- case $OUTPUT in
+ case $
TMP
OUTPUT in
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
+ *)
+ OUTPUT=$TMPOUTPUT
+ ;;
esac
# Create a playlist file for the playlist data to go into.
# We used to wipe it out if it existed. Now we request permision if interactive.
esac
# Create a playlist file for the playlist data to go into.
# We used to wipe it out if it existed. Now we request permision if interactive.