Andrew/configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

whipper: Remove unused --speed patch

Browse source
This commit is contained in:
Andrew Kvalheim 2023-12-17 21:57:02 -08:00
parent 5344a03f1f
commit da35b25d86
2 changed files with 0 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/packages.nix
View file

@ -80,7 +80,6 @@ specify {
ybaumes.highlight-trailing-white-spaces.search = open-vsx;
};
vscodium.gappsWrapperArgs = "--unset NIXOS_OZONE_WL"; # Workaround for mangled keybindings
whipper.patch = ../packages/resources/whipper_speed.patch; # Pending whipper-team/whipper#204
yaru-theme.patch = ../packages/resources/yaru-theme_font.patch; # Set GNOME Shell font
ydotool.patch = ../packages/resources/ydotool-halmakish.patch; # Pending ReimuNotMoe/ydotool#177
zsh-abbr.condition = z: !z.meta.unfree;

58
packages/resources/whipper_speed.patch
View file

@ -1,58 +0,0 @@
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -272,2 +272,6 @@
help="sample read offset")
+ self.parser.add_argument('-s', '--speed',
+ action="store", dest="maxspeed",
+ default=None,
+ help="Limit read speed of the drive")
self.parser.add_argument('-x', '--force-overread',
@@ -479,2 +483,3 @@
overread=self.options.overread,
+ maxspeed=self.options.maxspeed,
what='track %d of %d%s' % (
diff --git a/whipper/common/program.py b/whipper/common/program.py
index 56c39d0..442efad 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -560,3 +560,3 @@ class Program:
def ripTrack(self, runner, trackResult, offset, device, taglist,
- overread, what=None, coverArtPath=None):
+ overread, maxspeed=None, what=None, coverArtPath=None):
"""
@@ -600,2 +600,3 @@ class Program:
stop, overread,
+ maxspeed=maxspeed,
offset=offset,
diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py
index 5c4b779..65e246b 100644
--- a/whipper/program/cdparanoia.py
+++ b/whipper/program/cdparanoia.py
@@ -210,3 +210,3 @@ class ReadTrackTask(task.Task):
- def __init__(self, path, table, start, stop, overread, offset=0,
+ def __init__(self, path, table, start, stop, overread, maxspeed=None, offset=0,
device=None, action="Reading", what="track"):
@@ -238,2 +238,3 @@ class ReadTrackTask(task.Task):
self._stop = stop
+ self._maxspeed = maxspeed
self._offset = offset
@@ -278,2 +279,4 @@ class ReadTrackTask(task.Task):
"--sample-offset=%d" % self._offset, ]
+ if self._maxspeed:
+ argv.extend(["--force-read-speed", str(self._maxspeed), ])
if self._device:
@@ -441,3 +444,3 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
- def __init__(self, path, table, start, stop, overread, offset=0,
+ def __init__(self, path, table, start, stop, overread, maxspeed=None, offset=0,
device=None, taglist=None, what="track", coverArtPath=None):
@@ -478,6 +481,6 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
ReadTrackTask(tmppath, table, start, stop, overread,
- offset=offset, device=device, what=what))
+ maxspeed=maxspeed, offset=offset, device=device, what=what))
self.tasks.append(checksum.CRC32Task(tmppath))
t = ReadTrackTask(tmppath, table, start, stop, overread,
- offset=offset, device=device, action="Verifying",
+ maxspeed=maxspeed, offset=offset, device=device, action="Verifying",
what=what)