summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Mullender <sjoerd@acm.org>1994-01-28 09:56:05 (GMT)
committerSjoerd Mullender <sjoerd@acm.org>1994-01-28 09:56:05 (GMT)
commitffe9490d7902c7f91775df2e3fa128b2d2d62f30 (patch)
tree4085c44505124a06014cda0363434e32fd0e10e5
parent5125908d2b0f872d363b4164d62180398f76839e (diff)
downloadcpython-ffe9490d7902c7f91775df2e3fa128b2d2d62f30.zip
cpython-ffe9490d7902c7f91775df2e3fa128b2d2d62f30.tar.gz
cpython-ffe9490d7902c7f91775df2e3fa128b2d2d62f30.tar.bz2
aifc.py: framerate should be an int.
sunau.py: should convert number of frames correctly to number of bytes when reading.
-rw-r--r--Lib/aifc.py2
-rw-r--r--Lib/sunau.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/aifc.py b/Lib/aifc.py
index 11dcfe5..653dac9 100644
--- a/Lib/aifc.py
+++ b/Lib/aifc.py
@@ -515,7 +515,7 @@ class Aifc_read:
self._nchannels = _read_short(chunk)
self._nframes = _read_long(chunk)
self._sampwidth = (_read_short(chunk) + 7) / 8
- self._framerate = _read_float(chunk)
+ self._framerate = int(_read_float(chunk))
self._framesize = self._nchannels * self._sampwidth
if self._aifc:
#DEBUG: SGI's soundeditor produces a bad size :-(
diff --git a/Lib/sunau.py b/Lib/sunau.py
index 7ce74b5..17fa60d 100644
--- a/Lib/sunau.py
+++ b/Lib/sunau.py
@@ -254,7 +254,7 @@ class Au_read:
if nframes == AUDIO_UNKNOWN_SIZE:
data = self._file.read()
else:
- data = self._file.read(nframes * self._sampwidth * self._nchannels)
+ data = self._file.read(nframes * self._framesize * self._nchannels)
if self._encoding == AUDIO_FILE_ENCODING_MULAW_8:
import audioop
data = audioop.ulaw2lin(data, self._sampwidth)