diff options
Diffstat (limited to 'audio/abcde/files/patch-abcde.conf')
| -rw-r--r-- | audio/abcde/files/patch-abcde.conf | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/audio/abcde/files/patch-abcde.conf b/audio/abcde/files/patch-abcde.conf index dde86adda57e..45ea12c7a7c5 100644 --- a/audio/abcde/files/patch-abcde.conf +++ b/audio/abcde/files/patch-abcde.conf @@ -1,6 +1,6 @@ ---- abcde.conf.orig 2012-04-19 22:57:19.000000000 +0200 -+++ abcde.conf 2013-02-22 21:53:52.000000000 +0100 -@@ -136,8 +136,8 @@ +--- abcde.conf.orig 2014-12-18 17:39:40.000000000 +0100 ++++ abcde.conf 2014-12-18 17:45:51.000000000 +0100 +@@ -141,13 +141,13 @@ #CDDAFS=cp #CDDISCID=cd-discid #CDDBTOOL=cddb-tool @@ -11,53 +11,41 @@ #DISTMP3=distmp3 #VORBISCOMMENT=vorbiscomment #METAFLAC=metaflac -@@ -170,7 +170,8 @@ - - # Ogg: - #VORBIZEOPTS= --#OGGENCOPTS= -+#OFFENCOPTS= -+OGGENCOPTS="-q 5" - - # FLAC: - #FLACOPTS="-f" -@@ -193,7 +194,7 @@ - #CDDA2WAVOPTS= + #NORMALIZE=normalize-audio +-#CDSPEED=eject ++CDSPEED=cdcontrol + #VORBISGAIN=vorbisgain + #MKCUE=mkcue + #MKTOC=cdrdao +@@ -215,10 +215,10 @@ + #PIRDOPTS="-p" #CDDAFSOPTS="-f" #CDDBTOOLOPTS= -#EJECTOPTS= +EJECTOPTS="eject" #DISTMP3OPTS= #NORMALIZEOPTS= - #CDSPEEDOPTS="-x" -@@ -238,7 +239,7 @@ - - # OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination - # of them separated with ",": "ogg,mp3". --#OUTPUTTYPE=ogg -+OUTPUTTYPE=ogg - - # Output filename format - change this to reflect your inner desire to - # organize things differently than everyone else :) -@@ -251,9 +252,11 @@ - # to the files. Remove it from your user defined string if you are getting - # files like ".ogg.ogg". - #OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}' -+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}' - - # Like OUTPUTFORMAT but for Various Artists discs. - #VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' -+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}' - - # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips. - #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT -@@ -319,8 +322,7 @@ +-#CDSPEEDOPTS="-x" ++CDSPEEDOPTS="speed" + #CDSPEEDVALUE="" + #MKCUEOPTS="" + #MKTOCOPTS="" +@@ -245,7 +245,7 @@ + # CD device you want to read from + # It can be defined as a singletrack flac file, but since it might change from + # file to file it makes little sense to define it here. +-#CDROM=/dev/cdrom ++CDROM=/dev/cd0 + # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d" + # If we are using the ide-scsi emulation layer, we need to define a "g" + #CDPARANOIACDROMBUS="d" +@@ -343,8 +343,7 @@ # Custom pre-read function # By default it does nothing. # You can set some things to get abcde function in better ways: -# * Close the CD tray using eject -t (if available in eject and supported by -# your CD device. -+# * Close the CD tray using cdcontrol close ++# * Close the CD tray using cdcontrol close (if supported by your CD device). # * Set the CD speed. You can also use the built-in options, but you can also # set it here. In Debian, eject -x and cdset -x do the job. # KEEP IN MIND that executables included in pre_read must be in your $PATH or |