summaryrefslogtreecommitdiff
path: root/res/ari/resource_sounds.c
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-11-07 21:10:31 +0000
committerDavid M. Lee <dlee@digium.com>2013-11-07 21:10:31 +0000
commit7d0d1a1efb1d484cce28137f1abc1a6ece61d7e9 (patch)
treea61c7891a423ff7a70ae5bb3a5880ba4437702fd /res/ari/resource_sounds.c
parentcdfbc02df164a9bc49e23900fae66e696c4623aa (diff)
ari: User better nicknames for ARI operations
While working on building client libraries from the Swagger API, I noticed a problem with the nicknames. channel.deleteChannel() channel.answerChannel() channel.muteChannel() Etc. We put the object name in the nickname (since we were generating C code), but it makes OO generators redundant. This patch makes the nicknames more OO friendly. This resulted in a lot of name changing within the res_ari_*.so modules, but not much else. There were a couple of other fixed I made in the process. * When reversible operations (POST /hold, POST /unhold) were made more RESTful (POST /hold, DELETE /unhold), the path for the second operation was left in the API declaration. This worked, but really the two operations should have been on the same API. * The POST /unmute operation had still not been REST-ified. Review: https://reviewboard.asterisk.org/r/2940/ ........ Merged revisions 402528 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/ari/resource_sounds.c')
-rw-r--r--res/ari/resource_sounds.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c
index f77c8a227..5be4bf9a8 100644
--- a/res/ari/resource_sounds.c
+++ b/res/ari/resource_sounds.c
@@ -95,7 +95,8 @@ static int filter_langs_cb(void *obj, void *arg, int flags)
}
/*! \brief Generate a Sound structure as documented in sounds.json for the specified filename */
-static struct ast_json *create_sound_blob(const char *filename, struct ast_get_sounds_args *args)
+static struct ast_json *create_sound_blob(const char *filename,
+ struct ast_ari_sounds_list_args *args)
{
RAII_VAR(struct ast_json *, sound, NULL, ast_json_unref);
RAII_VAR(struct ao2_container *, languages, NULL, ao2_cleanup);
@@ -163,7 +164,7 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags)
{
struct ast_json *sounds_array = arg;
char *filename = obj;
- struct ast_get_sounds_args *args = data;
+ struct ast_ari_sounds_list_args *args = data;
struct ast_json *sound_blob = create_sound_blob(filename, args);
if (!sound_blob) {
return 0;
@@ -173,7 +174,9 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags)
return 0;
}
-void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args *args, struct ast_ari_response *response)
+void ast_ari_sounds_list(struct ast_variable *headers,
+ struct ast_ari_sounds_list_args *args,
+ struct ast_ari_response *response)
{
RAII_VAR(struct ao2_container *, sound_files, NULL, ao2_cleanup);
struct ast_json *sounds_blob;
@@ -206,7 +209,9 @@ void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args
ast_ari_response_ok(response, sounds_blob);
}
-void ast_ari_get_stored_sound(struct ast_variable *headers, struct ast_get_stored_sound_args *args, struct ast_ari_response *response)
+void ast_ari_sounds_get(struct ast_variable *headers,
+ struct ast_ari_sounds_get_args *args,
+ struct ast_ari_response *response)
{
struct ast_json *sound_blob;