Skip to content

Move module constants into cdef #39

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 3 commits into from
May 20, 2014
Merged

Move module constants into cdef #39

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f12e4a2
Add repr() in error message
mgeier Apr 27, 2014
f1ff790
Remove superfluous "struct"
mgeier Apr 27, 2014
a537ad5
Move module constants into cdef
mgeier Apr 27, 2014
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
69 changes: 42 additions & 27 deletions pysoundfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,29 @@

_ffi = _FFI()
_ffi.cdef("""
enum
{
SF_FORMAT_SUBMASK = 0x0000FFFF,
SF_FORMAT_TYPEMASK = 0x0FFF0000,
SF_FORMAT_ENDMASK = 0x30000000
} ;

enum
{
SFC_GET_FORMAT_INFO = 0x1028,

SFC_GET_FORMAT_MAJOR_COUNT = 0x1030,
SFC_GET_FORMAT_MAJOR = 0x1031,
SFC_GET_FORMAT_SUBTYPE_COUNT = 0x1032,
SFC_GET_FORMAT_SUBTYPE = 0x1033,
} ;

enum
{
SF_FALSE = 0,
SF_TRUE = 1,
} ;

typedef int64_t sf_count_t ;

typedef struct SNDFILE_tag SNDFILE ;
Expand Down Expand Up @@ -124,19 +147,6 @@
} SF_FORMAT_INFO ;
""")

_FALSE = 0
_TRUE = 1

_SUBMASK = 0x0000FFFF
_TYPEMASK = 0x0FFF0000
_ENDMASK = 0x30000000

_GET_FORMAT_INFO = 0x1028
_GET_FORMAT_MAJOR_COUNT = 0x1030
_GET_FORMAT_MAJOR = 0x1031
_GET_FORMAT_SUBTYPE_COUNT = 0x1032
_GET_FORMAT_SUBTYPE = 0x1033

_open_modes = {
'r': 0x10,
'w': 0x20,
Expand Down Expand Up @@ -368,15 +378,20 @@ def __init__(self, file, mode='r', sample_rate=None, channels=None,
frames = property(lambda self: self._info.frames)
sample_rate = property(lambda self: self._info.samplerate)
channels = property(lambda self: self._info.channels)
format = property(lambda self: _format_str(self._info.format & _TYPEMASK))
subtype = property(lambda self: _format_str(self._info.format & _SUBMASK))
endian = property(lambda self: _format_str(self._info.format & _ENDMASK))
format = property(
lambda self: _format_str(self._info.format & _snd.SF_FORMAT_TYPEMASK))
subtype = property(
lambda self: _format_str(self._info.format & _snd.SF_FORMAT_SUBMASK))
endian = property(
lambda self: _format_str(self._info.format & _snd.SF_FORMAT_ENDMASK))
format_info = property(
lambda self: _format_info(self._info.format & _TYPEMASK)[1])
lambda self: _format_info(self._info.format &
_snd.SF_FORMAT_TYPEMASK)[1])
subtype_info = property(
lambda self: _format_info(self._info.format & _SUBMASK)[1])
lambda self: _format_info(self._info.format &
_snd.SF_FORMAT_SUBMASK)[1])
sections = property(lambda self: self._info.sections)
seekable = property(lambda self: self._info.seekable == _TRUE)
seekable = property(lambda self: self._info.seekable == _snd.SF_TRUE)
closed = property(lambda self: self._file is None)

# avoid confusion if something goes wrong before assigning self._file:
Expand Down Expand Up @@ -471,7 +486,7 @@ def __setattr__(self, name, value):
self._check_if_closed()
if self.mode == 'r':
raise RuntimeError("Can not change %s of file in read mode" %
name)
repr(name))
data = _ffi.new('char[]', value.encode())
err = _snd.sf_set_string(self._file, _str_types[name], data)
self._handle_error_number(err)
Expand Down Expand Up @@ -692,7 +707,7 @@ def _format_int(format, subtype, endian):
info = _ffi.new("SF_INFO*")
info.format = result
info.channels = 1
if _snd.sf_format_check(info) == _FALSE:
if _snd.sf_format_check(info) == _snd.SF_FALSE:
raise ValueError(
"Invalid combination of format, subtype and endian")
return result
Expand All @@ -715,9 +730,9 @@ def _format_str(format_int):
return hex(format_int)


def _format_info(format_int, format_flag=_GET_FORMAT_INFO):
def _format_info(format_int, format_flag=_snd.SFC_GET_FORMAT_INFO):
# Return the ID and short description of a given format.
format_info = _ffi.new("struct SF_FORMAT_INFO*")
format_info = _ffi.new("SF_FORMAT_INFO*")
format_info.format = format_int
_snd.sf_command(_ffi.NULL, format_flag, format_info,
_ffi.sizeof("SF_FORMAT_INFO"))
Expand All @@ -736,8 +751,8 @@ def _available_formats_helper(count_flag, format_flag):

def available_formats():
"""Return a dictionary of available major formats."""
return dict(_available_formats_helper(_GET_FORMAT_MAJOR_COUNT,
_GET_FORMAT_MAJOR))
return dict(_available_formats_helper(_snd.SFC_GET_FORMAT_MAJOR_COUNT,
_snd.SFC_GET_FORMAT_MAJOR))


def available_subtypes(format=None):
Expand All @@ -746,7 +761,7 @@ def available_subtypes(format=None):
If format is specified, only compatible subtypes are returned.

"""
subtypes = _available_formats_helper(_GET_FORMAT_SUBTYPE_COUNT,
_GET_FORMAT_SUBTYPE)
subtypes = _available_formats_helper(_snd.SFC_GET_FORMAT_SUBTYPE_COUNT,
_snd.SFC_GET_FORMAT_SUBTYPE)
return dict((subtype, name) for subtype, name in subtypes
if format is None or format_check(format, subtype))