Revision: 1716
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1716&view=rev
Author:   jcsjcs
Date:     2007-10-03 13:59:45 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
        * scripts/convert-2mp3.sh: fix handling of genre option

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog_detailed
    gtkpod/trunk/scripts/convert-2mp3.sh

Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed     2007-10-03 20:40:27 UTC (rev 1715)
+++ gtkpod/trunk/ChangeLog_detailed     2007-10-03 20:59:45 UTC (rev 1716)
@@ -8,6 +8,8 @@
              next time
          Thanks to Mario Rossi.
 
+       * scripts/convert-2mp3.sh: fix handling of genre option
+
 2007-09-30  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
        * configure.in

Modified: gtkpod/trunk/scripts/convert-2mp3.sh
===================================================================
--- gtkpod/trunk/scripts/convert-2mp3.sh        2007-10-03 20:40:27 UTC (rev 
1715)
+++ gtkpod/trunk/scripts/convert-2mp3.sh        2007-10-03 20:59:45 UTC (rev 
1716)
@@ -28,8 +28,9 @@
 
 # Check if the genre is one which lame supports
 if [ -n "$genre" ] && `"$encoder" --genre-list | grep -qi "\b$genre\b"`; then
-    genreopt="--tg \"$genre\""
+    usegenre=$genre
 else
+    usegenre=""
     # check for id3v2
     id3v2=`which id3v2`
     if [ -n "$id3v2" ]; then
@@ -38,9 +39,9 @@
 fi
 
 if [ $filetype = "wav" ]; then
-    "$encoder" $ENCODER_OPTS --add-id3v2 --tt "$title" --ta "$artist" --tl 
"$album" --ty "$year" --tc "$comment" --tn "$track" "$genreopt" "$infile" 
"$outfile"
+    "$encoder" $ENCODER_OPTS --add-id3v2 --tt "$title" --ta "$artist" --tl 
"$album" --ty "$year" --tc "$comment" --tn "$track" --tg "$usegenre" "$infile" 
"$outfile"
 else
-    "$decoder" $options "$infile" | "$encoder" $ENCODER_OPTS --add-id3v2 --tt 
"$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn 
"$track" "$genreopt" - "$outfile"
+    "$decoder" $options "$infile" | "$encoder" $ENCODER_OPTS --add-id3v2 --tt 
"$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn 
"$track" --tg "$usegenre" - "$outfile"
 fi
 # Check result
 if [ "x$?" != "x0" ]; then


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to