diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-21 21:59:12 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-21 21:59:12 +0000 |
commit | 2a2a1439668c0ddf528efe04673d2ba15ae78ce0 (patch) | |
tree | f166bba69d92b06b74ab2323297f68cfcd7789fb /res/res_convert.c | |
parent | 901e02171baea1df9d10e7562f9fe32f64354f1f (diff) |
Lots more removal of deprecated things
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43452 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_convert.c')
-rw-r--r-- | res/res_convert.c | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/res/res_convert.c b/res/res_convert.c index 38d3e5399..d856c8faf 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -54,73 +54,6 @@ static int split_ext(char *filename, char **name, char **ext) } /*! \brief Convert a file from one format to another */ -static int cli_audio_convert_deprecated(int fd, int argc, char *argv[]) -{ - int ret = RESULT_FAILURE; - struct ast_filestream *fs_in = NULL, *fs_out = NULL; - struct ast_frame *f; - struct timeval start; - int cost; - char *file_in = NULL, *file_out = NULL; - char *name_in, *ext_in, *name_out, *ext_out; - - /* ugly, can be removed when CLI entries have ast_module pointers */ - ast_module_ref(ast_module_info->self); - - if (argc != 3 || ast_strlen_zero(argv[1]) || ast_strlen_zero(argv[2])) { - ret = RESULT_SHOWUSAGE; - goto fail_out; - } - - file_in = ast_strdupa(argv[1]); - file_out = ast_strdupa(argv[2]); - - if (split_ext(file_in, &name_in, &ext_in)) { - ast_cli(fd, "'%s' is an invalid filename!\n", argv[1]); - goto fail_out; - } - if (!(fs_in = ast_readfile(name_in, ext_in, NULL, O_RDONLY, 0, 0))) { - ast_cli(fd, "Unable to open input file: %s\n", argv[1]); - goto fail_out; - } - - if (split_ext(file_out, &name_out, &ext_out)) { - ast_cli(fd, "'%s' is an invalid filename!\n", argv[2]); - goto fail_out; - } - if (!(fs_out = ast_writefile(name_out, ext_out, NULL, O_CREAT|O_TRUNC|O_WRONLY, 0, 0644))) { - ast_cli(fd, "Unable to open output file: %s\n", argv[2]); - goto fail_out; - } - - start = ast_tvnow(); - - while ((f = ast_readframe(fs_in))) { - if (ast_writestream(fs_out, f)) { - ast_cli(fd, "Failed to convert %s.%s to %s.%s!\n", name_in, ext_in, name_out, ext_out); - goto fail_out; - } - } - - cost = ast_tvdiff_ms(ast_tvnow(), start); - ast_cli(fd, "Converted %s.%s to %s.%s in %dms\n", name_in, ext_in, name_out, ext_out, cost); - ret = RESULT_SUCCESS; - -fail_out: - if (fs_out) { - ast_closestream(fs_out); - if (ret != RESULT_SUCCESS) - ast_filedelete(name_out, ext_out); - } - - if (fs_in) - ast_closestream(fs_in); - - ast_module_unref(ast_module_info->self); - - return ret; -} - static int cli_audio_convert(int fd, int argc, char *argv[]) { int ret = RESULT_FAILURE; @@ -195,15 +128,10 @@ static char usage_audio_convert[] = "Example:\n" " file convert tt-weasels.gsm tt-weasels.ulaw\n"; -static struct ast_cli_entry cli_convert_deprecated = { - { "convert" , NULL }, - cli_audio_convert_deprecated, NULL, - NULL }; - static struct ast_cli_entry cli_convert[] = { { { "file", "convert" , NULL }, cli_audio_convert, "Convert audio file", - usage_audio_convert, NULL, &cli_convert_deprecated }, + usage_audio_convert }, }; static int unload_module(void) |