X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/f01bc9f6b79b2123a158f1462ec00fc63dedc889..c7bf0d8139e7373e953e30e035dc951494466feb:/fa-rip

diff --git a/fa-rip b/fa-rip
index 4b7f76d..6a08764 100755
--- a/fa-rip
+++ b/fa-rip
@@ -76,21 +76,21 @@ import musicbrainz2.webservice
 
 from org.diplodocus.util import catch_EnvironmentError as c
 
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439790
+MSF_OFFSET = 150
+
 def mkcue(disc, trackcount=None):
     fp = c(file, 'cue', 'w')
     c(fp.write, 'FILE "dummy.wav" WAVE\n')
-    c(fp.write, '  TRACK 01 AUDIO\n')
-    c(fp.write, '    INDEX 01 00:00:00\n')
 
     if trackcount == None:
         trackcount = disc.lastTrackNum
     else:
         trackcount = min(trackcount, disc.lastTrackNum)
 
-    pregap = disc.tracks[0][0]
-    for i in xrange(disc.firstTrackNum, trackcount):
-        offset = disc.tracks[i][0]
-        offset -= pregap
+    for i in xrange(disc.firstTrackNum, trackcount+1):
+        offset = disc.tracks[i-1][0]
+        offset -= MSF_OFFSET
 
         minutes = seconds = 0
         sectors = offset % 75
@@ -100,7 +100,9 @@ def mkcue(disc, trackcount=None):
                 minutes = seconds / 60
                 seconds = seconds % 60
 
-        c(fp.write, '  TRACK %02d AUDIO\n' % (i + 1,))
+        c(fp.write, '  TRACK %02d AUDIO\n' % (i,))
+        if i == 1 and offset > 0:
+            c(fp.write, '    INDEX 00 00:00:00\n')
         c(fp.write,
           '    INDEX 01 %02d:%02d:%02d\n' % (minutes, seconds, sectors))
 
@@ -239,6 +241,7 @@ def main(argv):
 
         tempdir = c((lambda x: tempfile.mkdtemp(prefix=x, dir='.')),
                     'flac-archive.')
+        sys.stderr.write('ripping to %s\n\n' % (tempdir,))
         c(os.chdir, tempdir)
 
         make_post_processor(options.post_processor)