mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +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:
@@ -21,6 +21,10 @@
|
||||
* \ingroup formats
|
||||
*/
|
||||
|
||||
/* the order of these dependencies is important... it also specifies
|
||||
the link order of the libraries during linking
|
||||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend>vorbis</depend>
|
||||
<depend>ogg</depend>
|
||||
@@ -542,28 +546,17 @@ static const struct ast_format vorbis_f = {
|
||||
.close = ogg_vorbis_close,
|
||||
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
|
||||
.desc_size = sizeof(struct vorbis_desc),
|
||||
.module = &mod_data, /* XXX */
|
||||
};
|
||||
|
||||
static int load_module(void *mod)
|
||||
static int load_module(void)
|
||||
{
|
||||
return ast_format_register(&vorbis_f);
|
||||
}
|
||||
|
||||
static int unload_module(void *mod)
|
||||
static int unload_module(void)
|
||||
{
|
||||
return ast_format_unregister(vorbis_f.name);
|
||||
}
|
||||
|
||||
static const char *description(void)
|
||||
{
|
||||
return "OGG/Vorbis audio";
|
||||
}
|
||||
|
||||
static const char *key(void)
|
||||
{
|
||||
return ASTERISK_GPL_KEY;
|
||||
}
|
||||
|
||||
STD_MOD1;
|
||||
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio");
|
||||
|
||||
|
Reference in New Issue
Block a user