* Fix speex tagging. (Closes issue 19).

    Thanks to vskytta for the patch.

git-svn-id: http://abcde.googlecode.com/svn/trunk@312 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index 749a86a..6281693 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -1133,11 +1133,10 @@ do_encode ()
                                                *=*) ;;
                                                *)   COMMENT="COMMENT=$COMMENT" ;;
                                        esac    
-                                       COMMENT="--comment \"$COMMENT\""
                                fi
-                               # Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
-                               if [ ! "$DOTAG" = "y" ]; then
-                                       $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT"
+                               # 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"
                                else
                                        $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
                                fi

diff --git a/changelog b/changelog
index c223865..4faf31d 100644 (file)
--- a/changelog
+++ b/changelog
@@ -8,7 +8,8 @@ abcde 2.5.1 UNRELEASED
       Closes: #669140
     + Don't tag CDDB string with musicbrainz id
       Closes: #669141
-  * 
+  * Fix speex tagging. (Closes issue 19).
+    Thanks to vskytta for the patch.
 
   [ Colin Tuckley ]
   * replace deprecated egrep with grep -E (Closes issue 24).