diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /formats/format_ogg_vorbis.c | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) |
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
Diffstat (limited to 'formats/format_ogg_vorbis.c')
-rw-r--r-- | formats/format_ogg_vorbis.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 84ef11b5d..d1122924a 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -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"); |