[rubyripper] 2 new revisions pushed by boukewou...@gmail.com on 2013-04-11 20:54 GMT

[rubyr...@googlecode.com]

2 new revisions:

Revision: 9d466f5e3d43
Author: Bouke Woudstra <boukew...@gmail.com>
Date: Thu Apr 11 13:55:39 2013
Log: Fix a typo.
http://code.google.com/p/rubyripper/source/detail?r=9d466f5e3d43

Revision: 861be295ece6
Author: Bouke Woudstra <boukew...@gmail.com>
Date: Thu Apr 11 14:00:39 2013
Log: Add support for the Fraunhofer AAC codec....
http://code.google.com/p/rubyripper/source/detail?r=861be295ece6

==============================================================================
Revision: 9d466f5e3d43
Author: Bouke Woudstra <boukew...@gmail.com>
Date: Thu Apr 11 13:55:39 2013
Log: Fix a typo.

http://code.google.com/p/rubyripper/source/detail?r=9d466f5e3d43

Modified:
/lib/rubyripper/secureRip.rb

=======================================
--- /lib/rubyripper/secureRip.rb Thu Jan 24 12:46:08 2013
+++ /lib/rubyripper/secureRip.rb Thu Apr 11 13:55:39 2013
@@ -321,7 +321,7 @@
# Sort the hash keys to prevent jumping forward and backwards in the
file
@errors.keys.sort.each do |key|
raise "Wrong position (key) for @errors: #{key.class}" unless
key.class == Fixnum
- raise "No array for @errors! (#{@errors[key].class)}" unless
@errors[key].class == Array
+ raise "No array for @errors! (#{@errors[key].class})" unless
@errors[key].class == Array
@errors[key].sort!
@errors[key].uniq.each do |result|
raise "Invalid chunk data: #{result.class}" unless result.class ==
String

==============================================================================
Revision: 861be295ece6
Author: Bouke Woudstra <boukew...@gmail.com>
Date: Thu Apr 11 14:00:39 2013
Log: Add support for the Fraunhofer AAC codec.

Much of the credit goes to Zophonias O. Jonsson for supplying
the patches. I did modify them to my taste, but basically this
just works fine :).

http://code.google.com/p/rubyripper/source/detail?r=861be295ece6

Added:
/lib/rubyripper/codecs/fraunhofer.rb
Modified:
/features/cli-preferences.feature
/features/testdata/settings
/lib/rubyripper/checkConfigBeforeRipping.rb
/lib/rubyripper/cli/cliPreferences.rb
/lib/rubyripper/codecs/main.rb
/lib/rubyripper/fileScheme.rb
/lib/rubyripper/gtk2/gtkPreferences.rb
/lib/rubyripper/preferences/data.rb
/lib/rubyripper/preferences/main.rb
/lib/rubyripper/preferences/setDefaults.rb

=======================================
--- /dev/null
+++ /lib/rubyripper/codecs/fraunhofer.rb Thu Apr 11 14:00:39 2013
@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+# Rubyripper - A secure ripper for Linux/BSD/OSX
+# Copyright (C) 2013 Bouke Woudstra (boukew...@gmail.com)
+#
+# This file is part of Rubyripper. Rubyripper is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+
+# This is the template for the Fdkaac (fraunhofer AAC) codec
+module Codecs
+ class Fraunhofer
+ def tags
+ {
+ :artist => "--artist",
+ :album => "--album",
+ :genre => "--genre",
+ :year => "--date",
+ :albumArtist => "--album-artist",
+ :discNumber => "--disk",
+ :encoder => "--comment",
+ :trackname => "--title",
+ :tracknumber => "--track",
+ }
+ end
+
+ def name ; 'fraunhofer' ; end
+ def binary ; 'fdkaac' ; end
+ def outputEncodingTag ; '-o' ; end
+ def extension ; 'm4a' ; end
+ def default; "-p 2 -m 5 -a 1" ; end
+
+ # the sequence of the command
+ def sequence ; [:binary, :prefs, :output, :tags, :input] ; end
+
+ # %s will be replaced by the output file
+ def replaygain(track)
+ "aacgain -c -r %s"
+ end
+
+ # %s will be replaced by a File.join(output directory, *.extension)
+ def replaygainAlbum
+ "aacgain -c -a %s"
+ end
+ end
+end
=======================================
--- /features/cli-preferences.feature Wed Jan 2 10:37:39 2013
+++ /features/cli-preferences.feature Thu Apr 11 14:00:39 2013
@@ -79,7 +79,7 @@

Please type the number of the setting you wish to change [99] :
"""
-
+
Scenario: Show the Toc Analysis submenu
When I choose "1" in order to get to the preferences menu
And I choose "2" in order to get to the toc analysis submenu
@@ -91,12 +91,12 @@
1) Create a cuesheet [ ]
2) Rip to single file [ ]
3) Rip hidden audio sectors [*]
- 4) Mark as a hidden track when longer than: 2 seconds
+ 4) Mark as a hidden track when longer than: 2 second(s)
5) Append or prepend audio: prepend
6) Way to handle pre-emphasis: cue
99) Back to settings main menu

- Please type the number of the setting you wish to change [99] :
+ Please type the number of the setting you wish to change [99] :
"""

Scenario: Update the Toc Analysis Preferences
@@ -117,7 +117,7 @@
1) Create a cuesheet [*]
2) Rip to single file [*]
3) Rip hidden audio sectors [ ]
- 4) Mark as a hidden track when longer than: 3 seconds
+ 4) Mark as a hidden track when longer than: 3 second(s)
5) Append or prepend audio: append
6) Way to handle pre-emphasis: sox
99) Back to settings main menu
@@ -141,19 +141,21 @@
6) LAME options passed: -V 3 --id3v2-only
7) Nero AAC [ ]
8) Nero options passed: -q 0.5
- 9) WavPack [ ]
- 10) WavPack options passed:
- 11) Opus [ ]
- 12) Opus options passed: --bitrate 160
- 13) WAVE [ ]
- 14) Other codec [ ]
- 15) Commandline passed: flac %i %o.flac
- 16) Playlist support [*]
- 17) Maximum extra encoding threads: 2
- 18) Replace spaces with underscores [ ]
- 19) Downsize all capital letters in file names [ ]
- 20) Normalize program: none
- 21) Normalize modus: album
+ 9) Fraunhofer AAC [ ]
+ 10) Fraunhofer options passed: -p 2 -m 5 -a 1
+ 11) WavPack [ ]
+ 12) WavPack options passed: -q
+ 13) Opus [ ]
+ 14) Opus options passed: --bitrate 160
+ 15) WAVE [ ]
+ 16) Other codec [ ]
+ 17) Commandline passed: flac %i %o.flac
+ 18) Playlist support [*]
+ 19) Maximum extra encoding threads: 2
+ 20) Replace spaces with underscores [ ]
+ 21) Downsize all capital letters in file names [ ]
+ 22) Normalize program: none
+ 23) Normalize modus: album
99) Back to settings main menu

Please type the number of the setting you wish to change [99] :
@@ -172,18 +174,20 @@
| 7 | |
| 8 | -q 0.6 |
| 9 | |
- | 10 | -f |
+ | 10 | -p 3 -m 4 -a 2 |
| 11 | |
- | 12 | --bitrate 200 |
+ | 12 | -f |
| 13 | |
- | 14 | |
- | 15 | lame "%i" "%o".mp3 |
+ | 14 | --bitrate 200 |
+ | 15 | |
| 16 | |
- | 17 | 3 |
+ | 17 | lame "%i" "%o".mp3 |
| 18 | |
- | 19 | |
- | 20 | 2 |
- | 21 | 2 |
+ | 19 | 3 |
+ | 20 | |
+ | 21 | |
+ | 22 | 2 |
+ | 23 | 2 |

And I press ENTER "3" times to close the application
Then the output should contain:
@@ -198,19 +202,21 @@
6) LAME options passed: -V 4
7) Nero AAC [*]
8) Nero options passed: -q 0.6
- 9) WavPack [*]
- 10) WavPack options passed: -f
- 11) Opus [*]
- 12) Opus options passed: --bitrate 200
- 13) WAVE [*]
- 14) Other codec [*]
- 15) Commandline passed: lame "%i" "%o".mp3
- 16) Playlist support [ ]
- 17) Maximum extra encoding threads: 3
- 18) Replace spaces with underscores [*]
- 19) Downsize all capital letters in file names [*]
- 20) Normalize program: replaygain
- 21) Normalize modus: track
+ 9) Fraunhofer AAC [*]
+ 10) Fraunhofer options passed: -p 3 -m 4 -a 2
+ 11) WavPack [*]
+ 12) WavPack options passed: -f
+ 13) Opus [*]
+ 14) Opus options passed: --bitrate 200
+ 15) WAVE [*]
+ 16) Other codec [*]
+ 17) Commandline passed: lame "%i" "%o".mp3
+ 18) Playlist support [ ]
+ 19) Maximum extra encoding threads: 3
+ 20) Replace spaces with underscores [*]
+ 21) Downsize all capital letters in file names [*]
+ 22) Normalize program: replaygain
+ 23) Normalize modus: track
99) Back to settings main menu

Please type the number of the setting you wish to change [99] :
=======================================
--- /features/testdata/settings Wed Aug 1 13:07:18 2012
+++ /features/testdata/settings Thu Apr 11 14:00:39 2013
@@ -20,8 +20,10 @@
settingsMp3=-V 3 --id3v2-only
nero=false
settingsNero=-q 0.5
+fraunhofer=false
+settingsFraunhofer=-p 2 -m 5 -a 1
wavpack=false
-settingsWavpack=
+settingsWavpack=-q
wav=false
other=false
settingsOther=flac %i %o.flac
=======================================
--- /lib/rubyripper/checkConfigBeforeRipping.rb Sat Sep 29 08:55:41 2012
+++ /lib/rubyripper/checkConfigBeforeRipping.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2010 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
@@ -84,6 +84,7 @@
isFound?('oggenc') if @prefs.vorbis
isFound?('lame') if @prefs.mp3
isFound?('neroAacEnc') if @prefs.nero
+ isFound?('fdkaac') if @prefs.fraunhofer
isFound?('wavpack') if @prefs.wavpack
isFound?('opusenc') if @prefs.opus
isFound?('normalize') if @prefs.normalizer == 'normalize'
@@ -93,7 +94,7 @@
isFound?('vorbisgain') if @prefs.vorbis
isFound?('mp3gain') if @prefs.mp3
isFound?('wavegain') if @prefs.wav
- isFound?('aacgain') if @prefs.nero
+ isFound?('aacgain') if @prefs.nero || @prefs.fraunhofer
end
end

=======================================
--- /lib/rubyripper/cli/cliPreferences.rb Thu Jan 24 11:26:07 2013
+++ /lib/rubyripper/cli/cliPreferences.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2010 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
@@ -229,19 +229,21 @@
@out.puts ' 6) ' + _("LAME options passed") + ": %s" %
[@prefs.settingsMp3]
@out.puts ' 7) ' + _("Nero AAC %s") % [showBool(@prefs.nero)]
@out.puts ' 8) ' + _("Nero options passed") + ": %s" %
[@prefs.settingsNero]
- @out.puts ' 9) ' + _("WavPack %s") % [showBool(@prefs.wavpack)]
- @out.puts '10) ' + _("WavPack options passed") + ": %s" %
[@prefs.settingsWavpack]
- @out.puts '11) ' + _("Opus %s") % [showBool(@prefs.opus)]
- @out.puts '12) ' + _("Opus options passed") + ": %s" %
[@prefs.settingsOpus]
- @out.puts '13) ' + _("WAVE %s") % [showBool(@prefs.wav)]
- @out.puts '14) ' + _("Other codec %s") % [showBool(@prefs.other)]
- @out.puts '15) ' + _("Commandline passed") + ": %s" %
[@prefs.settingsOther]
- @out.puts '16) ' + _("Playlist
support %s") %[showBool(@prefs.playlist)]
- @out.puts '17) ' + _("Maximum extra encoding threads") + ": %s" %
[@prefs.maxThreads]
- @out.puts '18) ' + _("Replace spaces with underscores %s") %
[showBool(@prefs.noSpaces)]
- @out.puts '19) ' + _("Downsize all capital letters in file
names %s") %[showBool(@prefs.noCapitals)]
- @out.puts '20) ' + _("Normalize program") + ": %s" %
[@prefs.normalizer]
- @out.puts '21) ' + _("Normalize modus") + ": %s" % [@prefs.gain]
+ @out.puts ' 9) ' + _("Fraunhofer AAC %s") %
[showBool(@prefs.fraunhofer)]
+ @out.puts '10) ' + _("Fraunhofer options passed") + ": %s" %
[@prefs.settingsFraunhofer]
+ @out.puts '11) ' + _("WavPack %s") % [showBool(@prefs.wavpack)]
+ @out.puts '12) ' + _("WavPack options passed") + ": %s" %
[@prefs.settingsWavpack]
+ @out.puts '13) ' + _("Opus %s") % [showBool(@prefs.opus)]
+ @out.puts '14) ' + _("Opus options passed") + ": %s" %
[@prefs.settingsOpus]
+ @out.puts '15) ' + _("WAVE %s") % [showBool(@prefs.wav)]
+ @out.puts '16) ' + _("Other codec %s") % [showBool(@prefs.other)]
+ @out.puts '17) ' + _("Commandline passed") + ": %s" %
[@prefs.settingsOther]
+ @out.puts '18) ' + _("Playlist
support %s") %[showBool(@prefs.playlist)]
+ @out.puts '19) ' + _("Maximum extra encoding threads") + ": %s" %
[@prefs.maxThreads]
+ @out.puts '20) ' + _("Replace spaces with underscores %s") %
[showBool(@prefs.noSpaces)]
+ @out.puts '21) ' + _("Downsize all capital letters in file
names %s") %[showBool(@prefs.noCapitals)]
+ @out.puts '22) ' + _("Normalize program") + ": %s" %
[@prefs.normalizer]
+ @out.puts '23) ' + _("Normalize modus") + ": %s" % [@prefs.gain]
@out.puts '99) ' + _("Back to settings main menu")
@out.puts ""
@int.get("Please type the number of the setting you wish to change",
99)
@@ -263,22 +265,25 @@
when 7 then switchBool('nero')
when 8 then @prefs.settingsNero = \
@string.get(_("Nero options passed"), @prefs.settingsNero)
- when 9 then switchBool('wavpack')
- when 10 then @prefs.settingsWavpack = \
+ when 9 then switchBool('fraunhofer')
+ when 10 then @prefs.settingsFraunhofer = \
+ @string.get(_("Fraunhofer options passed"),
@prefs.settingsFraunhofer)
+ when 11 then switchBool('wavpack')
+ when 12 then @prefs.settingsWavpack = \
@string.get(_("WavPack options passed"), @prefs.settingsWavpack)
- when 11 then switchBool('opus')
- when 12 then @prefs.settingsOpus = \
+ when 13 then switchBool('opus')
+ when 14 then @prefs.settingsOpus = \
@string.get(_("Opus options passed"), @prefs.settingsOpus)
- when 13 then switchBool('wav')
- when 14 then switchBool('other')
- when 15 then setOtherCodec()
- when 16 then switchBool('playlist')
- when 17 then @prefs.maxThreads = \
+ when 15 then switchBool('wav')
+ when 16 then switchBool('other')
+ when 17 then setOtherCodec()
+ when 18 then switchBool('playlist')
+ when 19 then @prefs.maxThreads = \
@int.get(_("Maximum extra encoding threads"), 2)
- when 18 then switchBool('noSpaces')
- when 19 then switchBool('noCapitals')
- when 20 then setNormalizer()
- when 21 then setNormalizeModus()
+ when 20 then switchBool('noSpaces')
+ when 21 then switchBool('noCapitals')
+ when 22 then setNormalizer()
+ when 23 then setNormalizeModus()
else noValidChoiceMessage(choice)
end
loopSubMenuCodecs() unless choice == 99
=======================================
--- /lib/rubyripper/codecs/main.rb Wed Jan 9 14:10:49 2013
+++ /lib/rubyripper/codecs/main.rb Thu Apr 11 14:00:39 2013
@@ -23,6 +23,8 @@
# * Add the option into the user interfaces
# * Add the extension to filescheme class
# * Add some configuration checks to CheckConfigBeforeRipping
+# * update the cucumber feature test for cli-metadata
+# * update the spec for codecs

require 'rubyripper/disc/disc'
require 'rubyripper/fileScheme'
=======================================
--- /lib/rubyripper/fileScheme.rb Sun Oct 21 05:09:04 2012
+++ /lib/rubyripper/fileScheme.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2012 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
@@ -257,6 +257,7 @@
when 'mp3' then '.mp3'
when 'wav' then '.wav'
when 'nero' then '.m4a'
+ when 'fraunhofer' then '.m4a'
when 'wavpack' then '.wv'
when 'opus' then '.opus'
when 'other' then @otherExtension
=======================================
--- /lib/rubyripper/gtk2/gtkPreferences.rb Tue Apr 9 13:57:24 2013
+++ /lib/rubyripper/gtk2/gtkPreferences.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2011 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,7 +31,8 @@
def initialize(prefs=nil, deps=nil)
@prefs = prefs ? prefs : Preferences::Main.instance
@deps = deps ? deps : Dependency.instance
- @codec_labels = {'flac' => 'FLAC', 'wavpack' => 'WavPack', 'other' =>
_('Other')}
+ @codec_labels = {'flac' => 'FLAC', 'wavpack' => 'WavPack', 'nero'
=> 'Nero AAC',
+ 'fraunhofer' => 'Fraunhofer AAC', 'other' =>
_('Other')}
end

def start
@@ -459,7 +460,7 @@
createCodecsTable()
@frame70 = newFrame(_('Active audio codecs'), child=@selectCodecsTable)
end
-
+
def createCodecRow(codec)
@codecRows[codec] = [Gtk::Label.new(getLabelForCodec(codec))]
@codecRows[codec][0].set_alignment(0, 0.5)
@@ -471,8 +472,8 @@
@codecRows[codec][1].text = @prefs.send('settings' +
codec.capitalize)
end
@codecRows[codec] << Gtk::Button.new(Gtk::Stock::REMOVE)
- addTooltipForOtherCodec(@codecRows[codec][1]) if codec == 'other'
-
+ addTooltipForOtherCodec(@codecRows[codec][1]) if codec == 'other'
+
# connect the remove button signal
@codecRows[codec][2].signal_connect("button_release_event") do |a, b|
@codecRows[codec].each{|object| @selectCodecsTable.remove(object)}
@@ -481,11 +482,11 @@
updateCodecsView()
end
end
-
+
def getLabelForCodec(codec)
@codec_labels.key?(codec) ? @codec_labels[codec] : codec.capitalize
end
-
+
def getCodecForLabel(label)
@codec_labels.value?(label) ? @codec_labels.key(label) : label.downcase
end
=======================================
--- /lib/rubyripper/preferences/data.rb Sun Sep 30 09:22:14 2012
+++ /lib/rubyripper/preferences/data.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2011 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
@@ -20,20 +20,20 @@
class Data

def allCodecs
- ['flac', 'mp3', 'vorbis', 'wav', 'nero', 'wavpack', 'opus', 'other']
+
['flac', 'mp3', 'vorbis', 'wav', 'nero', 'fraunhofer', 'wavpack', 'opus', 'other']
end
-
+
def codecs
@codecs ||= setActiveCodecs()
end
-
+
# return all active codecs in an array
def setActiveCodecs
@codecs = Array.new
allCodecs.each{|codec| @codecs << codec if self.send(codec)}
@codecs
end
-
+
# RIPPING PREFERENCES
# The location of the drive that does the ripping
attr_accessor :cdrom
@@ -103,24 +103,33 @@
# Use wav
attr_accessor :wav

+ # Use wav parameters (only there to be consistent)
+ attr_accessor :settingsWav
+
# Use Nero AAC
attr_accessor :nero
-
+
# Pass nero parameters
attr_accessor :settingsNero
-
+
+ # Use Fraunhofer AAC (fdkaac)
+ attr_accessor :fraunhofer
+
+ # Pass fraunhofer parameters
+ attr_accessor :settingsFraunhofer
+
# Use Wavpack
attr_accessor :wavpack
-
+
# Pass wavpack parameters
attr_accessor :settingsWavpack
-
+
# Use Opus
attr_accessor :opus
-
+
# Pass Opus parameters
attr_accessor :settingsOpus
-
+
# Use other codec
attr_accessor :other

=======================================
--- /lib/rubyripper/preferences/main.rb Wed Mar 7 13:50:30 2012
+++ /lib/rubyripper/preferences/main.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2010 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
=======================================
--- /lib/rubyripper/preferences/setDefaults.rb Mon Oct 22 12:15:21 2012
+++ /lib/rubyripper/preferences/setDefaults.rb Thu Apr 11 14:00:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Rubyripper - A secure ripper for Linux/BSD/OSX
-# Copyright (C) 2007 - 2010 Bouke Woudstra (boukew...@gmail.com)
+# Copyright (C) 2007 - 2013 Bouke Woudstra (boukew...@gmail.com)
#
# This file is part of Rubyripper. Rubyripper is free software: you can
# redistribute it and/or modify it under the terms of the GNU General
@@ -65,6 +65,8 @@
@data.settingsMp3 = '-V 3 --id3v2-only'
@data.nero = false
@data.settingsNero = '-q 0.5'
+ @data.fraunhofer = false
+ @data.settingsFraunhofer = '-p 2 -m 5 -a 1'
@data.wavpack = false
@data.settingsWavpack = ''
@data.opus = false