Merged revisions 54290 via svnmerge from
[asterisk/asterisk.git] / formats / format_g726.c
index 135e0a8..41cd87a 100644 (file)
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
@@ -137,7 +137,7 @@ static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
        s->fr.frametype = AST_FRAME_VOICE;
        s->fr.subclass = AST_FORMAT_G726;
        s->fr.mallocd = 0;
-       FR_SET_BUF(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size[fs->rate]);
+       AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, frame_size[fs->rate]);
        s->fr.samples = 8 * FRAME_TIME;
        if ((res = fread(s->fr.data, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
                if (res)
@@ -190,8 +190,6 @@ static off_t g726_tell(struct ast_filestream *fs)
        return -1;
 }
 
-static struct ast_format_lock me = { .usecnt = -1 };
-
 static const struct ast_format f[] = {
        {
                .name = "g726-40",
@@ -206,7 +204,6 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .lockp = &me,
        },
        {
                .name = "g726-32",
@@ -221,7 +218,6 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .lockp = &me,
        },
        {
                .name = "g726-24",
@@ -236,7 +232,6 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .lockp = &me,
        },
        {
                .name = "g726-16",
@@ -251,15 +246,11 @@ static const struct ast_format f[] = {
                .read = g726_read,
                .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
                .desc_size = sizeof(struct g726_desc),
-               .lockp = &me,
        },
        {       .format = 0 }   /* terminator */
 };
 
-/*
- * Module interface (load_module, unload_module, usecount, description, key)
- */
-int load_module()
+static int load_module(void)
 {
        int i;
 
@@ -272,7 +263,7 @@ int load_module()
        return 0;
 }
 
-int unload_module()
+static int unload_module(void)
 {
        int i;
 
@@ -283,18 +274,4 @@ int unload_module()
        return(0);
 }      
 
-int usecount()
-{
-       return me.usecnt;
-}
-
-const char *description()
-{
-       return "Raw G.726 (16/24/32/40kbps) data";
-}
-
-const char *key()
-{
-       return ASTERISK_GPL_KEY;
-}
-
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data");