[SCM] morituri/master: * morituri/program/cdparanoia.py: Fix up track counting so HTOA can be ripped again. * examples/readhtoa.py: Fix up example so it works again, tested on Silent Alarm.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e0ed33b1daf35ff428c323e1a74d54f0b1aa4dee
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri May 15 19:42:08 2009 +0000

    	* morituri/program/cdparanoia.py:
    	  Fix up track counting so HTOA can be ripped again.
    	* examples/readhtoa.py:
    	  Fix up example so it works again, tested on Silent Alarm.

diff --git a/ChangeLog b/ChangeLog
index f399a23..cd044f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-05-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/program/cdparanoia.py:
+	  Fix up track counting so HTOA can be ripped again.
+	* examples/readhtoa.py:
+	  Fix up example so it works again, tested on Silent Alarm.
+
+2009-05-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/test/test_image_toc.py:
 	* morituri/test/bloc.cue (added):
 	  Add an expected .cue file for the bloc party toc.
diff --git a/examples/readhtoa.py b/examples/readhtoa.py
index 62db228..b409998 100644
--- a/examples/readhtoa.py
+++ b/examples/readhtoa.py
@@ -53,12 +53,12 @@ def main():
         print 'No Hidden Track One Audio found.'
         return
 
-    start = index[0]
-    stop, _ = track.getIndex(1)
+    start = index.absolute
+    stop = track.getIndex(1).absolute
     print 'Found Hidden Track One Audio from frame %d to %d' % (start, stop)
         
     # rip it
-    riptask = cdparanoia.ReadVerifyTrackTask('track00.wav', table,
+    riptask = cdparanoia.ReadVerifyTrackTask('track00.wav', t.table,
         start, stop - 1,
         offset=int(options.offset))
     runner.run(riptask)
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index a8541ed..e3103b1 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -111,9 +111,9 @@ class ReadTrackTask(task.Task):
         task.Task.start(self, runner)
 
         # find on which track the range starts and stops
-        startTrack = 1
+        startTrack = 0
         startOffset = 0
-        stopTrack = 1
+        stopTrack = 0
         stopOffset = self._stop
 
         for i, t in enumerate(self._table.tracks):
@@ -247,14 +247,11 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
         self.tasks = []
         self.tasks.append(
             ReadTrackTask(tmppath, table, start, stop, offset))
-        self.tasks.append(
-            checksum.CRC32Task(tmppath))
+        self.tasks.append(checksum.CRC32Task(tmppath))
         t = ReadTrackTask(tmppath, table, start, stop, offset)
         t.description = 'Verifying track...'
-        self.tasks.append(
-            ReadTrackTask(tmppath, table, start, stop, offset))
-        self.tasks.append(
-            checksum.CRC32Task(tmppath))
+        self.tasks.append(t)
+        self.tasks.append(checksum.CRC32Task(tmppath))
 
         self.checksum = None
 

-- 
morituri packaging