Skip to content

Commit

Permalink
Switch to libcdio-cdparanoia (from cdparanoia)
Browse files Browse the repository at this point in the history
Next commits will add a choice to fall back to the old one, or pick a
different name. But let's get this ready for testing now.
  • Loading branch information
MerlijnWajer committed Jan 22, 2018
1 parent cac64f0 commit ad714dd
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions whipper/program/cdparanoia.py
Expand Up @@ -295,10 +295,10 @@ def start(self, runner):

bufsize = 1024
if self._overread:
argv = ["cdparanoia", "--stderr-progress",
argv = ["cd-paranoia", "--stderr-progress",
"--sample-offset=%d" % self._offset, "--force-overread", ]
else:
argv = ["cdparanoia", "--stderr-progress",
argv = ["cd-paranoia", "--stderr-progress",
"--sample-offset=%d" % self._offset, ]
if self._device:
argv.extend(["--force-cdrom-device", self._device, ])
Expand All @@ -317,7 +317,7 @@ def start(self, runner):
except OSError as e:
import errno
if e.errno == errno.ENOENT:
raise common.MissingDependencyException('cdparanoia')
raise common.MissingDependencyException('cd-paranoia')

raise

Expand Down Expand Up @@ -579,8 +579,8 @@ def stop(self):


def getCdParanoiaVersion():
getter = common.VersionGetter('cdparanoia',
["cdparanoia", "-V"],
getter = common.VersionGetter('cd-paranoia',
["cd-paranoia", "-V"],
_VERSION_RE,
"%(version)s %(release)s")

Expand All @@ -605,12 +605,12 @@ class AnalyzeTask(ctask.PopenTask):
def __init__(self, device=None):
# cdparanoia -A *always* writes cdparanoia.log
self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
self.command = ['cdparanoia', '-A']
self.command = ['cd-paranoia', '-A']
if device:
self.command += ['-d', device]

def commandMissing(self):
raise common.MissingDependencyException('cdparanoia')
raise common.MissingDependencyException('cd-paranoia')

def readbyteserr(self, bytes):
self._output.append(bytes)
Expand Down

0 comments on commit ad714dd

Please sign in to comment.