[SCM] morituri/master: move some assignments around to be more logical
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:10:12 UTC 2014
The following commit has been merged in the master branch:
commit 61fdb2c332067c9b216322b491f6920b28abe747
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Tue Aug 20 00:38:19 2013 +0200
move some assignments around to be more logical
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index 7d293fc..62c5c52 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -217,24 +217,27 @@ class TocFile(object, log.Loggable):
currentTrack.number, pregapLength,
currentTrack.getIndex(1))
- # update running totals
+ # create a new track to be filled by later lines
trackNumber += 1
+ trackMode = m.group('mode')
+ audio = trackMode == 'AUDIO'
+ currentTrack = table.Track(trackNumber, audio=audio)
+ self.table.tracks.append(currentTrack)
+
+ # update running totals
absoluteOffset += currentLength
relativeOffset += currentLength
totalLength += currentLength
- trackMode = m.group('mode')
- # reset counters
+ # FIXME: track mode
+ self.debug('found track %d, mode %s, at absoluteOffset %d',
+ trackNumber, trackMode, absoluteOffset)
+
+ # reset counters relative to a track
currentLength = 0
indexNumber = 1
pregapLength = 0
- # FIXME: track mode
- self.debug('found track %d, mode %s, at absoluteOffset %d',
- trackNumber, trackMode, absoluteOffset)
- audio = trackMode == 'AUDIO'
- currentTrack = table.Track(trackNumber, audio=audio)
- self.table.tracks.append(currentTrack)
continue
# look for ISRC lines
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list