From 8b0c007ad990aa27d9868da49215fd1076ac77cc Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 21 Aug 2006 02:11:39 +0000 Subject: merge new_loader_completion branch, including (at least): - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b --- formats/format_pcm.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'formats/format_pcm.c') diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 2d84851e9..67a54eb48 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -424,7 +424,6 @@ static const struct ast_format alaw_f = { .tell = pcm_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, - .module = &mod_data, /* XXX */ #ifdef REALTIME_WRITE .open = pcma_open, .rewrite = pcma_rewrite, @@ -442,7 +441,6 @@ static const struct ast_format pcm_f = { .tell = pcm_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, - .module = &mod_data, /* XXX */ }; static const struct ast_format au_f = { @@ -457,10 +455,9 @@ static const struct ast_format au_f = { .tell = au_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, /* this many shorts */ - .module = &mod_data, /* XXX */ }; -static int load_module(void *mod) +static int load_module(void) { int index; @@ -474,20 +471,10 @@ static int load_module(void *mod) || ast_format_register(&au_f); } -static int unload_module(void *mod) +static int unload_module(void) { return ast_format_unregister(pcm_f.name) || ast_format_unregister(alaw_f.name) || ast_format_unregister(au_f.name); } -static const char *description(void) -{ - return "Raw/Sun uLaw/ALaw 8khz Audio support (PCM,PCMA,AU)"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8khz Audio support (PCM,PCMA,AU)"); -- cgit v1.2.3