From 9234804a3bf81f2df18c2f9dd9680d848ff21e48 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Fri, 11 Oct 2013 16:36:00 +0000 Subject: Multiple revisions 400508,400842-400843,400848 ........ r400508 | dlee | 2013-10-03 23:54:51 -0500 (Thu, 03 Oct 2013) | 1 line Corrected response class for stopPlayback ........ r400842 | dlee | 2013-10-10 14:23:24 -0500 (Thu, 10 Oct 2013) | 1 line Correct some ARI wiki rendering errors ........ r400843 | dlee | 2013-10-10 14:26:19 -0500 (Thu, 10 Oct 2013) | 1 line Updated /play resource docs. The playback of http: resources isn't implemented... yet ........ r400848 | dlee | 2013-10-11 11:18:46 -0500 (Fri, 11 Oct 2013) | 5 lines Fix a stupid copy/paste error in ARI docs. Patches: ari-doc-patch.txt uploaded by jbigelow (license 5091) ........ Merged revisions 400508,400842-400843,400848 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400852 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/ari/resource_bridges.h | 2 +- res/ari/resource_channels.h | 2 +- res/ari/resource_playback.h | 2 +- res/res_ari_playback.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h index dd4575a73..573317122 100644 --- a/res/ari/resource_bridges.h +++ b/res/ari/resource_bridges.h @@ -179,7 +179,7 @@ struct ast_play_on_bridge_args { /*! * \brief Start playback of media on a bridge. * - * The media URI may be any of a number of URI's. You may use http: and https: URI's, as well as sound: and recording: URI's. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.) + * The media URI may be any of a number of URI's. Currently sound: and recording: URI's are supported. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.) * * \param headers HTTP headers * \param args Swagger parameters diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h index e4dcc1b7d..699424efd 100644 --- a/res/ari/resource_channels.h +++ b/res/ari/resource_channels.h @@ -260,7 +260,7 @@ struct ast_play_on_channel_args { /*! * \brief Start playback of media. * - * The media URI may be any of a number of URI's. You may use http: and https: URI's, as well as sound: and recording: URI's. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.) + * The media URI may be any of a number of URI's. Currently sound: and recording: URI's are supported. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.) * * \param headers HTTP headers * \param args Swagger parameters diff --git a/res/ari/resource_playback.h b/res/ari/resource_playback.h index c606a5caf..719997a00 100644 --- a/res/ari/resource_playback.h +++ b/res/ari/resource_playback.h @@ -73,7 +73,7 @@ struct ast_control_playback_args { const char *operation; }; /*! - * \brief Get a playback's details. + * \brief Control a playback. * * \param headers HTTP headers * \param args Swagger parameters diff --git a/res/res_ari_playback.c b/res/res_ari_playback.c index 55da058a8..e30800d08 100644 --- a/res/res_ari_playback.c +++ b/res/res_ari_playback.c @@ -145,7 +145,7 @@ static void ast_ari_stop_playback_cb( break; default: if (200 <= code && code <= 299) { - is_valid = ast_ari_validate_playback( + is_valid = ast_ari_validate_void( response->message); } else { ast_log(LOG_ERROR, "Invalid error response %d for /playback/{playbackId}\n", code); -- cgit v1.2.3