fix the growing track length problem... turns out that AudioResource

takes a sample count, not the end sample possition...

[git-p4: depot-paths = "//depot/": change = 1425]

audioraw.py

@@ -112,6 +112,7 @@ class AudioResource(resource.Resource):
 		request.setHeader('content-type', makemtfromdec(decoder))
 		bytespersample = decoder.channels * decoder.bitspersample / 8
 		tbytes = self.cnt * bytespersample
+		#print 'tbytes:', `tbytes`, 'cnt:', `self.cnt`
 		skipbytes = 0
 
 		request.setHeader('content-length', tbytes)
@@ -224,6 +225,7 @@ class AudioDisc(FSObject, Album):
 		start = self.gettrackstart(i)
 		kwargs['start'] = start
 		kwargs['samples'] = trkarray[trkidx + 1]['offset'] - start
+		#print 'track: %d, kwargs: %s' % (i, `kwargs`)
 
 		return AudioRaw, oi, (), kwargs
 
@@ -239,8 +241,9 @@ class AudioRaw(AudioItem, FSObject):
 
 		FSObject.__init__(self, kwargs['path'])
 
+		#print 'AudioRaw:', `startsamp`, `samples`
 		kwargs['content'] = AudioResource(file,
-		    kwargs.pop('decoder'), startsamp, startsamp + samples)
+		    kwargs.pop('decoder'), startsamp, samples)
 		AudioItem.__init__(self, *args, **kwargs)
 
 		self.url = '%s/%s' % (self.cd.urlbase, self.id)