Manually unbreak the core binding. The pyglet code generator generates
one structure def per function call, which means the structs can't be passed between functions (!!). It's fixed manually for now, but the pyglet generator should be fixed.
This commit is contained in:
parent
7ea76d34d7
commit
24730f52d1
@ -13,13 +13,13 @@ import ctypes
|
||||
from ctypes import *
|
||||
from ctypes.util import find_library as _find_library
|
||||
|
||||
_libpath = _find_library('isofs')
|
||||
if not _libpath:
|
||||
raise ImportError('Could not locate isofs library')
|
||||
#_libpath = _find_library('isofs')
|
||||
#if not _libpath:
|
||||
# raise ImportError('Could not locate isofs library')
|
||||
|
||||
# If you are a developer, comment the above three lines and uncomment
|
||||
# the following line, to hardcode the library path.
|
||||
#_libpath = 'libisofs.so'
|
||||
_libpath = 'libisofs.so'
|
||||
|
||||
_lib = cdll.LoadLibrary(_libpath)
|
||||
|
||||
@ -41,18 +41,6 @@ class c_void(Structure):
|
||||
|
||||
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:45
|
||||
iso_volume_new = _lib.iso_volume_new
|
||||
iso_volume_new.restype = POINTER(struct_iso_volume)
|
||||
iso_volume_new.argtypes = [c_char_p, c_char_p, c_char_p]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
@ -67,199 +55,85 @@ struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volset(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volset._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_burn_source(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_burn_source._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:45
|
||||
iso_volume_new = _lib.iso_volume_new
|
||||
iso_volume_new.restype = POINTER(struct_iso_volume)
|
||||
iso_volume_new.argtypes = [c_char_p, c_char_p, c_char_p]
|
||||
|
||||
# ../../../libisofs/libisofs.h:49
|
||||
iso_volume_new_with_root = _lib.iso_volume_new_with_root
|
||||
iso_volume_new_with_root.restype = POINTER(struct_iso_volume)
|
||||
iso_volume_new_with_root.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(struct_iso_tree_node)]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:57
|
||||
iso_volume_free = _lib.iso_volume_free
|
||||
iso_volume_free.restype = None
|
||||
iso_volume_free.argtypes = [POINTER(struct_iso_volume)]
|
||||
|
||||
class struct_iso_volset(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volset._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:62
|
||||
iso_volset_free = _lib.iso_volset_free
|
||||
iso_volset_free.restype = None
|
||||
iso_volset_free.argtypes = [POINTER(struct_iso_volset)]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:67
|
||||
iso_volume_get_root = _lib.iso_volume_get_root
|
||||
iso_volume_get_root.restype = POINTER(struct_iso_tree_node)
|
||||
iso_volume_get_root.argtypes = [POINTER(struct_iso_volume)]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:72
|
||||
iso_volume_set_volume_id = _lib.iso_volume_set_volume_id
|
||||
iso_volume_set_volume_id.restype = None
|
||||
iso_volume_set_volume_id.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:78
|
||||
iso_volume_set_publisher_id = _lib.iso_volume_set_publisher_id
|
||||
iso_volume_set_publisher_id.restype = None
|
||||
iso_volume_set_publisher_id.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:84
|
||||
iso_volume_set_data_preparer_id = _lib.iso_volume_set_data_preparer_id
|
||||
iso_volume_set_data_preparer_id.restype = None
|
||||
iso_volume_set_data_preparer_id.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:96
|
||||
iso_tree_volume_path_to_node = _lib.iso_tree_volume_path_to_node
|
||||
iso_tree_volume_path_to_node.restype = POINTER(struct_iso_tree_node)
|
||||
iso_tree_volume_path_to_node.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:107
|
||||
iso_tree_volume_add_path = _lib.iso_tree_volume_add_path
|
||||
iso_tree_volume_add_path.restype = POINTER(struct_iso_tree_node)
|
||||
iso_tree_volume_add_path.argtypes = [POINTER(struct_iso_volume), c_char_p, c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:119
|
||||
iso_tree_volume_add_new_dir = _lib.iso_tree_volume_add_new_dir
|
||||
iso_tree_volume_add_new_dir.restype = POINTER(struct_iso_tree_node)
|
||||
iso_tree_volume_add_new_dir.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_volset(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volset._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volume(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volume._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:128
|
||||
iso_volset_new = _lib.iso_volset_new
|
||||
iso_volset_new.restype = POINTER(struct_iso_volset)
|
||||
iso_volset_new.argtypes = [POINTER(struct_iso_volume), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:141
|
||||
iso_tree_add_node = _lib.iso_tree_add_node
|
||||
iso_tree_add_node.restype = POINTER(struct_iso_tree_node)
|
||||
iso_tree_add_node.argtypes = [POINTER(struct_iso_tree_node), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:157
|
||||
iso_tree_radd_dir = _lib.iso_tree_radd_dir
|
||||
iso_tree_radd_dir.restype = POINTER(struct_iso_tree_node)
|
||||
@ -280,63 +154,21 @@ iso_exclude_empty = _lib.iso_exclude_empty
|
||||
iso_exclude_empty.restype = None
|
||||
iso_exclude_empty.argtypes = []
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:191
|
||||
iso_tree_add_new_dir = _lib.iso_tree_add_new_dir
|
||||
iso_tree_add_new_dir.restype = POINTER(struct_iso_tree_node)
|
||||
iso_tree_add_new_dir.argtypes = [POINTER(struct_iso_tree_node), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:197
|
||||
iso_tree_node_set_name = _lib.iso_tree_node_set_name
|
||||
iso_tree_node_set_name.restype = None
|
||||
iso_tree_node_set_name.argtypes = [POINTER(struct_iso_tree_node), c_char_p]
|
||||
|
||||
class struct_iso_tree_node(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_tree_node._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:204
|
||||
iso_tree_print = _lib.iso_tree_print
|
||||
iso_tree_print.restype = None
|
||||
iso_tree_print.argtypes = [POINTER(struct_iso_tree_node), c_int]
|
||||
|
||||
class struct_burn_source(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_burn_source._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
class struct_iso_volset(Structure):
|
||||
__slots__ = [
|
||||
]
|
||||
struct_iso_volset._fields_ = [
|
||||
('_opaque_struct', c_int)
|
||||
]
|
||||
|
||||
# ../../../libisofs/libisofs.h:220
|
||||
iso_source_new_ecma119 = _lib.iso_source_new_ecma119
|
||||
iso_source_new_ecma119.restype = POINTER(struct_burn_source)
|
||||
|
Loading…
Reference in New Issue
Block a user