* Re-fix speex tagging. (Closes issue 19).

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index e9c9074..50ef599 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -13,7 +13,7 @@
 #
 # $Id$
 
 #
 # $Id$
 

-VERSION='2.5.1-UNRELEASED'
+VERSION='2.5.2'

 
 usage ()
 {
 
 usage ()
 {


@@ -1137,7 +1137,7 @@ do_encode ()
                                fi
                                # Tag the file at encode time, as it can't be done after encoding.
                                if [ "$DOTAG" = "y" ]; then
                                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
                                else
                                        $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
                                fi


@@ -2272,7 +2272,7 @@ do_cdtext ()
        for TRACK in $(f_seq_row 1 $TRACKS)
        do
                TRACKM1=$(($TRACK - 1))
        for TRACK in $(f_seq_row 1 $TRACKS)
        do
                TRACKM1=$(($TRACK - 1))

-               TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | cut -c11- | tr -d \\r\\n)"
+               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
                echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
                sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" $ABCDETEMPDIR/cddbread.1
        done