mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 11:58:40 +00:00
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: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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)");
|
||||
|
||||
Reference in New Issue
Block a user