diff options
Diffstat (limited to 'codecs/codec_g726.c')
| -rw-r--r-- | codecs/codec_g726.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index e3e766b47..3b979eb63 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -775,8 +775,6 @@ static struct ast_frame *lintog726_sample (void) return &f; } -static struct ast_module_lock me = { .usecnt = -1 }; - static struct ast_translator g726tolin = { .name = "g726tolin", .srcfmt = AST_FORMAT_G726, @@ -788,7 +786,6 @@ static struct ast_translator g726tolin = { .buffer_samples = BUFFER_SAMPLES, .buf_size = BUFFER_SAMPLES * 2, .plc_samples = 160, - .lockp = &me, }; static struct ast_translator lintog726 = { @@ -801,7 +798,6 @@ static struct ast_translator lintog726 = { .desc_size = sizeof(struct g726_coder_pvt), .buffer_samples = BUFFER_SAMPLES, .buf_size = BUFFER_SAMPLES/2, - .lockp = &me, }; static void parse_config(void) @@ -823,47 +819,39 @@ static void parse_config(void) /*! \brief standard module glue */ -int reload(void) +static int reload(void *mod) { parse_config(); return 0; } -int unload_module (void) +static int unload_module (void *mod) { int res; - ast_mutex_lock (&me.lock); res = ast_unregister_translator (&lintog726); res |= ast_unregister_translator (&g726tolin); - if (me.usecnt) - res = -1; - ast_mutex_unlock (&me.lock); return res; } -int load_module (void) +static int load_module (void *mod) { int res; parse_config(); - res = ast_register_translator (&g726tolin); + res = ast_register_translator (&g726tolin, mod); if (!res) - res = ast_register_translator (&lintog726); + res = ast_register_translator (&lintog726, mod); else ast_unregister_translator (&g726tolin); return res; } -const char *description(void) +static const char *description(void) { return "ITU G.726-32kbps G726 Transcoder"; } -int usecount (void) -{ - return me.usecnt; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, reload, NULL, NULL); |