Skip to content

read(): don't ignore frames if out is given? #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgeier merged 1 commit into from
Jun 18, 2014
Merged

read(): don't ignore frames if out is given? #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pysoundfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ def _read_or_write(self, funcname, array, frames):
ffi_type = _ffi_types[array.dtype]
assert array.flags.c_contiguous
assert array.dtype.itemsize == _ffi.sizeof(ffi_type)
assert array.size == frames * self.channels
assert array.size >= frames * self.channels

func = getattr(_snd, funcname + ffi_type)
ptr = _ffi.cast(ffi_type + '*', array.ctypes.data)
Expand All @@ -633,8 +633,8 @@ def read(self, frames=-1, dtype='float64', always_2d=True,
one-dimensional array in this case.

If out is specified, the data is written into the given NumPy
array. In this case, the arguments frames, dtype and always_2d
are silently ignored!
array. In this case, the arguments dtype and always_2d are
silently ignored!

If there is less data left in the file than requested, the rest
of the frames are filled with fill_value. If fill_value=None, a
Expand All @@ -658,7 +658,8 @@ def read(self, frames=-1, dtype='float64', always_2d=True,
shape = frames,
out = _np.empty(shape, dtype, order='C')
else:
frames = len(out)
if frames < 0 or frames > len(out):
frames = len(out)
if not out.flags.c_contiguous:
raise ValueError("out must be C-contiguous")

Expand Down