From c4df517cf6863efa5b76b2dcce23547bddfa32cb Mon Sep 17 00:00:00 2001 From: "EinvalSledge@gmail.com" Date: Tue, 27 Nov 2012 17:36:08 +0000 Subject: [PATCH] Switch from Musepack SV7 to SV8. Thanks to Andrew Strong for the patch. git-svn-id: http://abcde.googlecode.com/svn/trunk@370 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 35 ++++++++++++++++------------------- abcde.1 | 12 ++++++------ abcde.conf | 16 ++++++++-------- changelog | 4 +++- debian/control | 2 +- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/abcde b/abcde index a1718b2..03dcfb0 100755 --- a/abcde +++ b/abcde @@ -1025,7 +1025,7 @@ do_encode () TEMPARG="PIPE_$SPEEXENCODER" ;; mpc) - TEMPARG="PIPE_$MPPENCODER" + TEMPARG="PIPE_$MPCENCODER" ;; m4a) TEMPARG="PIPE_$AACENCODERSYNTAX" @@ -1145,12 +1145,9 @@ do_encode () ;; mpc) # MPP/MP+(Musepack) format (.mpc) is done locally, with inline - # tagging. - # I tried compiling the mppenc from corecodecs.org and got some - # errors, so I have not tried it myself. - ## FIXME ## Needs some cleanup to determine if an empty tag sent - ## FIXME ## to the encoder ends up empty. - $RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT" + # tagging. Uses mpcenc for Musepack SV8 encoding, changed from + # Musepack SV7 which used mppenc.... + $RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT" ;; m4a) # Tag the file at encode time, as it can't be done after encoding. @@ -3151,7 +3148,7 @@ MP3ENCODERSYNTAX=default OGGENCODERSYNTAX=default FLACENCODERSYNTAX=default SPEEXENCODERSYNTAX=default -MPPENCODERSYNTAX=default +MPCENCODERSYNTAX=default AACENCODERSYNTAX=default NORMALIZERSYNTAX=default CUEREADERSYNTAX=default @@ -3204,7 +3201,7 @@ FLAC=flac # speex SPEEXENC=speexenc # mpp (Musepack) -MPPENC=mppenc +MPCENC=mpcenc # m4a AACENC=faac @@ -3255,7 +3252,7 @@ FLACGAINOPTS="--add-replay-gain" # speex SPEEXENCOPTS= # mpc -MPPENCOPTS= +MPCENCOPTS= # m4a AACENCOPTS= @@ -3733,7 +3730,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; - mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; + mpc:*) MPCENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; esac done @@ -3745,7 +3742,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then fi # If nothing has been specified, use oggenc for oggs and lame for mp3s and flac -# for flacs and speexenc for speex and mppenc for mpps and faac for m4as +# for flacs and speexenc for speex and mpcenc for mpcs and faac for m4as # Getting ready for multiple output changes for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) @@ -3773,7 +3770,7 @@ do # [ "$DOREPLAYGAIN" = "y" ] && ;; mpc) - [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc + [ "$MPCENCODERSYNTAX" = "default" ] && MPCENCODERSYNTAX=mpcenc [ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y ;; m4a) @@ -3857,10 +3854,10 @@ case "$SPEEXENCODERSYNTAX" in SPEEXENCODER="$SPEEXENC" ;; esac -case "$MPPENCODERSYNTAX" in - mppenc) - MPPENCODEROPTS="${MPPENCODEROPTSCLI:-$MPPENCOPTS}" - MPPENCODER="$MPPENC" +case "$MPCENCODERSYNTAX" in + mpcenc) + MPCENCODEROPTS="${MPCENCODEROPTSCLI:-$MPCENCOPTS}" + MPCENCODER="$MPCENC" ;; esac case "$AACENCODERSYNTAX" in @@ -3981,7 +3978,7 @@ if [ "$USEPIPES" = "y" ]; then spx) PIPEENCODERSVARCHECK="PIPE_$SPEEXENCODER" ;; mpc) - PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;; + PIPEENCODERSVARCHECK="PIPE_$MPCENCODER" ;; esac decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )" if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \ @@ -4003,7 +4000,7 @@ fi # Make sure a buncha things exist for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ - $OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \ + $OGGENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \ $AACENCODER $CDDBTOOL \ ${NEEDATOMICPARSLEY+$ATOMICPARSLEY} \ ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \ diff --git a/abcde.1 b/abcde.1 index 446becc..c51c4c1 100644 --- a/abcde.1 +++ b/abcde.1 @@ -313,9 +313,9 @@ Specifies the style of encoder to use for the FLAC encoder. At this point only Specifies the style of encoder to use for Speex encoder. At this point only \'speexenc\' is available for Ogg/Speex encoding. .TP -.B MPPENCODERSYNTAX +.B MPCENCODERSYNTAX Specifies the style of encoder to use for MPP/MP+ (Musepack) encoder. At this -point we only have \'mppenc\' available, from corecodecs.org. +point we only have \'mpcenc\' available, from musepack.net. .TP .B AACENCODERSYNTAX Specifies the style of encoder to use for M4A (AAC) encoder. At this point we @@ -357,7 +357,7 @@ with \fBdistmp3\fR (DISTMP3NICE). .B PATHNAMES The following configuration file options specify the pathnames of their respective utilities: LAME, TOOLAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC, -VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, AACEND, ID3, EYED3, EYED3, METAFLAC, +VORBIZE, OGGENC, FLAC, SPEEXENC, MPCENC, AACEND, ID3, EYED3, EYED3, METAFLAC, CDPARANOIA, CDDA2WAV, CDDAFS, CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3, VORBISCOMMENT, NORMALIZE, CDSPEED, MP3GAIN, VORBISGAIN, MPPGAIN, MKCUE, MKTOC, CUE2DISCID (see option "\-X"), DIFF and HTTPGET. @@ -366,7 +366,7 @@ CUE2DISCID (see option "\-X"), DIFF and HTTPGET. If you wish to specify command-line options to any of the programs \fBabcde\fR uses, set the following configuration file options: LAMEOPTS, TOOLAMEOPTS, GOGOOPTS, BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS, -FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, EYED3OPTS, MP3GAINOPTS, +FLACOPTS, SPEEXENCOPTS, MPCENCOPTS, AACENCOPTS, ID3OPTS, EYED3OPTS, MP3GAINOPTS, CDPARANOIAOPTS, CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS, NORMALIZEOPTS, CDSPEEDOPTS, MKCUEOPTS, VORBISCOMMMENTOPTS, METAFLACOPTS, DIFFOPTS, FLACGAINOPTS, VORBISGAINOPTS and HTTPGETOPTS. @@ -551,7 +551,7 @@ Will extract the files contained in singletrack using the embedded cuesheet. \fBabcde\fR requires the following backend tools to work: .TP .B * -An Ogg/Vorbis, MP3, FLAC, Ogg/Speex, MPP/MP+(Musepack) or M4A encoder (oggenc, vorbize, lame, gogo, bladeenc, l3enc, mp3enc, flac, speexenc, mppenc, faac) +An Ogg/Vorbis, MP3, FLAC, Ogg/Speex, MPP/MP+(Musepack) or M4A encoder (oggenc, vorbize, lame, gogo, bladeenc, l3enc, mp3enc, flac, speexenc, mpcenc, faac) .TP .B * An audio CD reading utility (cdparanoia, icedax, cdda2wav, dagrab) @@ -590,7 +590,7 @@ information about the CD. .BR flac (1), .BR toolame (1), .BR speexenc (1), -.BR mppenc (1), +.BR mpcenc (1), .BR faac (1), .BR id3 (1), .BR eyeD3 (1), diff --git a/abcde.conf b/abcde.conf index 3abab9c..afeba9e 100644 --- a/abcde.conf +++ b/abcde.conf @@ -59,8 +59,8 @@ # lame, gogo, bladeenc, l3enc, xingmp3enc, mp3enc - for MP3ENCODERSYNTAX # flac - the only supported for FLACENCODERSYNTAX at the moment # speexenc - the only encoder for SPEEXENCODERSYNTAX -# mppenc - encoder for MPPENCODERSYNTAX -# default is a valid option for oggenc, lame, flac, speexenc and mppenc. +# mpcenc - encoder for MPCENCODERSYNTAX +# default is a valid option for oggenc, lame, flac, speexenc and mpcenc. # Currently this affects the default location of the binary, the variable # to pick encoder command-line options from, and where the options are # given. @@ -68,7 +68,7 @@ #OGGENCODERSYNTAX=default #FLACENCODERSYNTAX=default #SPEEXENCODERSYNTAX=default -#MPPENCODERSYNTAX=default +#MPCENCODERSYNTAX=default #AACENCODERSYNTAX=default # Specify the syntax of the normalize binary here - so far only 'normalize' @@ -126,7 +126,7 @@ #OGGENC=oggenc #FLAC=flac #SPEEXENC=speexenc -#MPPENC=mppenc +#MPCENC=mpcenc #AACENC=faac #ID3=id3 @@ -179,10 +179,10 @@ #SPEEXENCOPTS= # MPP/MP+ (Musepack): -# For the encoder options take a look at the manpage. Set them like this: -# MPPENCOPTS='--xtreme' if you wish to set more options then: -# MPPENCOPTS='--xtreme --skip 20 --fade 10' -#MPPENCOPTS= +# For the encoder options look at: mpcenc --longhelp. Set them like this: +# MPCENCOPTS='--xtreme' if you wish to set more options then: +# MPCENCOPTS='--xtreme --skip 20 --fade 10' +#MPCENCOPTS= # M4A/AAC #AACENCOPTS= diff --git a/changelog b/changelog index bf6c845..01ad987 100644 --- a/changelog +++ b/changelog @@ -8,8 +8,10 @@ abcde 2.5.5 UNRELEASED for the patch. Closes issue 74. * Fix infinite loop if cddb fails. Thanks to Dominic Hargreaves for the patch. Closes: #687038 in Debian + * Switch from Musepack SV7 to SV8. Thanks to Andrew Strong for the + patch. - -- Steve McIntyre <93sam@debian.org> Tue, 18 Sep 2012 12:42:11 +0100 + -- Steve McIntyre <93sam@debian.org> Tue, 27 Nov 2012 17:34:55 +0000 abcde 2.5.4 diff --git a/debian/control b/debian/control index 729612e..d166810 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Svn: http://abcde.googlecode.com/svn/trunk/ Package: abcde Architecture: all -Depends: ${misc:Depends}, cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex +Depends: ${misc:Depends}, cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex | musepack-tools Recommends: vorbis-tools, libmusicbrainz-discid-perl, libwebservice-musicbrainz-perl, libdigest-sha-perl, mailx Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue, mp3gain, atomicparsley Description: A Better CD Encoder -- 2.20.1