Use regular T_PTROBJ and typedefs instead of a complex typemap

[audio-opusfile.git] / Opusfile.xs

diff --git a/Opusfile.xs b/Opusfile.xs
index 6a5f55da6f2148f3303cc97fe552abcd71cb5ecd..7779aa979526305cb509b379cb3d29682ee96be4 100644 (file)
--- a/Opusfile.xs
+++ b/Opusfile.xs
@@ -11,55 +11,96 @@
 
 #include "const-c.inc"
 
+typedef OggOpusFile*    Audio__Opusfile;
+typedef const OpusHead* Audio__Opusfile__Head;
+typedef const OpusTags* Audio__Opusfile__Tags;
+typedef const OpusPictureTag* Audio__Opusfile__PictureTag;
+
 MODULE = Audio::Opusfile               PACKAGE = Audio::Opusfile               PREFIX = op_
 
 PROTOTYPES: ENABLE
 INCLUDE: const-xs.inc
 
-OggOpusFile*
+Audio::Opusfile
 op_open_file(path)
        const char *path;
 PREINIT:
        int err;
-CODE:
-       RETVAL = op_open_file(path, &err);
+C_ARGS:
+       path, &err
+POSTCALL:
        if(err)
                croak("op_open_file returned error %d\n", err);
+
+Audio::Opusfile
+op_open_memory(const char *data, size_t length(data))
+PREINIT:
+       int err;
+C_ARGS:
+       data, XSauto_length_of_data, &err
+POSTCALL:
+       if(err)
+               croak("op_open_memory returned error %d\n", err);
+
+bool
+op_test(const char *data, size_t length(data))
+PROTOTYPE: $
+PREINIT:
+       int ret;
+CODE:
+       ret = op_test (NULL, data, XSauto_length_of_data);
+       if(ret < 0 && ret != OP_ENOTFORMAT && ret != OP_EBADHEADER)
+               croak("op_test returned error %d\n", RETVAL);
+       RETVAL = !ret;
 OUTPUT:
        RETVAL
 
+
 void
 DESTROY(of)
-       OggOpusFile *of;
+       Audio::Opusfile of;
 CODE:
        op_free(of);
 
-const OpusHead*
+bool
+op_seekable(of)
+       Audio::Opusfile of;
+
+int
+op_link_count(of)
+       Audio::Opusfile of;
+
+int
+op_serialno(of, li = -1)
+       Audio::Opusfile of;
+       int li;
+
+Audio::Opusfile::Head
 op_head(of, li = -1)
-       OggOpusFile *of;
+       Audio::Opusfile of;
        int li;
 
-const OpusTags*
+Audio::Opusfile::Tags
 op_tags(of, li = -1)
-       OggOpusFile *of;
+       Audio::Opusfile of;
        int li;
 
 MODULE = Audio::Opusfile               PACKAGE = Audio::Opusfile::Tags         PREFIX = opus_tags_
 
 int
 opus_tags_query_count(tags, tag)
-       const OpusTags* tags;
+       Audio::Opusfile::Tags tags;
        const char* tag;
 
 const char*
 opus_tags_query(tags, tag, count = 0)
-       const OpusTags* tags;
+       Audio::Opusfile::Tags tags;
        const char* tag;
        int count;
 
 MODULE = Audio::Opusfile               PACKAGE = Audio::Opusfile::PictureTag           PREFIX = opus_picture_tag_
 
-const OpusPictureTag*
+Audio::Opusfile::PictureTag
 opus_picture_tag_parse(tag)
        const char *tag;
 PREINIT:
@@ -75,13 +116,13 @@ OUTPUT:
 
 void
 DESTROY(pic)
-       const OpusPictureTag* pic
+       Audio::Opusfile::PictureTag pic
 CODE:
        Safefree(pic);
 
 int
 type(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->type;
 OUTPUT:
@@ -89,7 +130,7 @@ OUTPUT:
 
 const char*
 mime_type(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->mime_type;
 OUTPUT:
@@ -97,7 +138,7 @@ OUTPUT:
 
 const char*
 description(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->description;
 OUTPUT:
@@ -105,7 +146,7 @@ OUTPUT:
 
 int
 width(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->width;
 OUTPUT:
@@ -113,7 +154,7 @@ OUTPUT:
 
 int
 height(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->height;
 OUTPUT:
@@ -121,7 +162,7 @@ OUTPUT:
 
 int
 depth(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->depth;
 OUTPUT:
@@ -129,7 +170,7 @@ OUTPUT:
 
 int
 colors(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->colors;
 OUTPUT:
@@ -137,7 +178,7 @@ OUTPUT:
 
 int
 data_length(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->data_length;
 OUTPUT:
@@ -145,7 +186,7 @@ OUTPUT:
 
 SV*
 data(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = newSVpvn(pic->data, pic->data_length);
 OUTPUT:
@@ -153,7 +194,7 @@ OUTPUT:
 
 int
 format(pic)
-       const OpusPictureTag *pic;
+       Audio::Opusfile::PictureTag pic;
 CODE:
        RETVAL = pic->format;
 OUTPUT:
@@ -163,7 +204,7 @@ MODULE = Audio::Opusfile            PACKAGE = Audio::Opusfile::Head
 
 int
 version(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->version;
 OUTPUT:
@@ -171,7 +212,7 @@ OUTPUT:
 
 int
 channel_count(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->channel_count;
 OUTPUT:
@@ -179,7 +220,7 @@ OUTPUT:
 
 unsigned
 pre_skip(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->pre_skip;
 OUTPUT:
@@ -187,7 +228,7 @@ OUTPUT:
 
 unsigned
 input_sample_rate(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->input_sample_rate;
 OUTPUT:
@@ -195,7 +236,7 @@ OUTPUT:
 
 int
 mapping_family(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->mapping_family;
 OUTPUT:
@@ -203,7 +244,7 @@ OUTPUT:
 
 int
 stream_count(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->stream_count;
 OUTPUT:
@@ -211,7 +252,7 @@ OUTPUT:
 
 int
 coupled_count(head)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
 CODE:
        RETVAL = head->coupled_count;
 OUTPUT:
@@ -219,7 +260,7 @@ OUTPUT:
 
 int
 mapping(head, k)
-       const OpusHead* head;
+       Audio::Opusfile::Head head;
        int k;
 CODE:
        RETVAL = (int) head->mapping[k];