benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* morituri/common/encode.py:

Browse Source 
* morituri/program/cdparanoia.py:
	  Add encoding profiles, kept simple for now as a class and
	  subclasses.  Use them to encode.  Calculate peak level while
	  encoding, compared to EAC and replaygain's value.
	* morituri/rip/cd.py:
	  Use the encoding profiles, ripping with the right extension.
	  Add a --profile parameter for it.
This commit is contained in:
Thomas Vander Stichele
2009-05-31 23:04:58 +00:00
parent b3c2949066
commit f33c50cead
4 changed files with 144 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
morituri/program/cdparanoia.py
View File

@@ -27,7 +27,7 @@ import shutil
import subprocess
import tempfile
from morituri.common import task, log, common, checksum
from morituri.common import task, log, common, checksum, encode
from morituri.extern import asyncsub
class FileSizeError(Exception):
@@ -228,22 +228,25 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
@ivar checksum: the checksum of the track; set if they match.
@ivar testchecksum: the test checksum of the track.
@ivar copychecksum: the copy checksum of the track.
@ivar peak: the peak level of the track
"""
def __init__(self, path, table, start, stop, offset=0, device=None):
def __init__(self, path, table, start, stop, offset=0, device=None, profile=None):
"""
@param path: where to store the ripped track
@type path: str
@param table: table of contents of CD
@type table: L{table.Table}
@param start: first frame to rip
@type start: int
@param stop: last frame to rip (inclusive)
@type stop: int
@param offset: read offset, in samples
@type offset: int
@param device: the device to rip from
@type device: str
@param path: where to store the ripped track
@type path: str
@param table: table of contents of CD
@type table: L{table.Table}
@param start: first frame to rip
@type start: int
@param stop: last frame to rip (inclusive)
@type stop: int
@param offset: read offset, in samples
@type offset: int
@param device: the device to rip from
@type device: str
@param profile: the encoding profile
@type profile: str
"""
task.MultiSeparateTask.__init__(self)
@@ -263,10 +266,20 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
self.tasks.append(t)
self.tasks.append(checksum.CRC32Task(tmppath))
# FIXME: clean this up
fd, tmpoutpath = tempfile.mkstemp(suffix='.morituri.flac')
os.close(fd)
self._tmppath = tmpoutpath
self.tasks.append(encode.EncodeTask(tmppath, tmpoutpath, profile))
# make sure our encoding is accurate
self.tasks.append(checksum.CRC32Task(tmpoutpath))
self.checksum = None
def stop(self):
if not self.exception:
self.peak = self.tasks[4].peak
self.testchecksum = c1 = self.tasks[1].checksum
self.copychecksum = c2 = self.tasks[3].checksum
if c1 == c2:
@@ -275,6 +288,8 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
else:
self.error('read and verify failed')
if self.tasks[5].checksum != self.checksum:
self.error('Encoding failed, checksum does not match')
try:
shutil.move(self._tmppath, self.path)
self.checksum = checksum