diff --git a/ChangeLog b/ChangeLog index 3e86b1a..053fe04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-04-15 Thomas Vander Stichele + + * morituri/image/image.py: + * morituri/image/toc.py: + * morituri/common/checksum.py (added): + * morituri/common/crc.py (deleted): + Rename crc to checksum, because AccurateRip checksums are not CRC's. + 2009-04-15 Thomas Vander Stichele * examples/ARcue.py: diff --git a/morituri/common/crc.py b/morituri/common/checksum.py similarity index 100% rename from morituri/common/crc.py rename to morituri/common/checksum.py diff --git a/morituri/image/image.py b/morituri/image/image.py index 597f569..1dab761 100644 --- a/morituri/image/image.py +++ b/morituri/image/image.py @@ -29,7 +29,7 @@ import struct import gst -from morituri.common import task, crc +from morituri.common import task, checksum from morituri.image import cue, toc class Image: @@ -169,10 +169,10 @@ class AudioRipCRCTask(MultiTask): offset = index[0] path = image.getRealPath(file.path) - crctask = crc.CRCAudioRipTask(path, + crctask = checksum.CRCAudioRipTask(path, trackNumber=trackIndex + 1, trackCount=len(cue.tracks), - frameStart=offset * crc.FRAMES_PER_DISC_FRAME, - frameLength=length * crc.FRAMES_PER_DISC_FRAME) + frameStart=offset * checksum.FRAMES_PER_DISC_FRAME, + frameLength=length * checksum.FRAMES_PER_DISC_FRAME) self.addTask(crctask) def stop(self): @@ -252,8 +252,8 @@ class ImageVerifyTask(MultiTask): # print '%d has length %d' % (trackIndex, taskk.length) index = track._indexes[1] offset = index[0] - assert taskk.length % crc.FRAMES_PER_DISC_FRAME == 0 - end = taskk.length / crc.FRAMES_PER_DISC_FRAME + assert taskk.length % checksum.FRAMES_PER_DISC_FRAME == 0 + end = taskk.length / checksum.FRAMES_PER_DISC_FRAME self.lengths[trackIndex] = end - offset MultiTask.stop(self) diff --git a/morituri/image/toc.py b/morituri/image/toc.py index 329e7b5..3312ea2 100644 --- a/morituri/image/toc.py +++ b/morituri/image/toc.py @@ -29,7 +29,7 @@ import struct import gst -from morituri.common import task, crc +from morituri.common import task, checksum from morituri.image import cue class Track: @@ -134,14 +134,14 @@ class TOC: # CD's have a standard lead-in time of 2 seconds # which gets added for CDDB disc id's offset = self.getTrackStart(track.number) + \ - 2 * crc.DISC_FRAMES_PER_SECOND - seconds = offset / crc.DISC_FRAMES_PER_SECOND + 2 * checksum.DISC_FRAMES_PER_SECOND + seconds = offset / checksum.DISC_FRAMES_PER_SECOND n += self._cddbSum(seconds) last = self.tracks[-1] leadout = self.getTrackEnd(last.number) frameLength = leadout - self.getTrackStart(1) - t = frameLength / crc.DISC_FRAMES_PER_SECOND + t = frameLength / checksum.DISC_FRAMES_PER_SECOND value = (n % 0xff) << 24 | t << 8 | len(self.tracks)