summaryrefslogtreecommitdiff
path: root/rest-api
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-10-11 16:36:00 +0000
committerDavid M. Lee <dlee@digium.com>2013-10-11 16:36:00 +0000
commit9234804a3bf81f2df18c2f9dd9680d848ff21e48 (patch)
treeaa8195dfe160f7070dc72c93f4a2042287ac4fa5 /rest-api
parent07e2b1d02839a4a8cb6320a0b4ee41ba613c6e56 (diff)
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
Diffstat (limited to 'rest-api')
-rw-r--r--rest-api/api-docs/bridges.json2
-rw-r--r--rest-api/api-docs/channels.json2
-rw-r--r--rest-api/api-docs/playback.json4
3 files changed, 4 insertions, 4 deletions
diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json
index 9f8af9e0e..640cf4c5d 100644
--- a/rest-api/api-docs/bridges.json
+++ b/rest-api/api-docs/bridges.json
@@ -278,7 +278,7 @@
{
"httpMethod": "POST",
"summary": "Start playback of media on a bridge.",
- "notes": "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.)",
+ "notes": "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.)",
"nickname": "playOnBridge",
"responseClass": "Playback",
"parameters": [
diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index b408d8b17..9d60b2b7c 100644
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -544,7 +544,7 @@
{
"httpMethod": "POST",
"summary": "Start playback of media.",
- "notes": "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.)",
+ "notes": "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.)",
"nickname": "playOnChannel",
"responseClass": "Playback",
"parameters": [
diff --git a/rest-api/api-docs/playback.json b/rest-api/api-docs/playback.json
index 734abdbff..a195186f2 100644
--- a/rest-api/api-docs/playback.json
+++ b/rest-api/api-docs/playback.json
@@ -31,7 +31,7 @@
"httpMethod": "DELETE",
"summary": "Stop a playback.",
"nickname": "stopPlayback",
- "responseClass": "Playback",
+ "responseClass": "void",
"parameters": [
{
"name": "playbackId",
@@ -51,7 +51,7 @@
"operations": [
{
"httpMethod": "POST",
- "summary": "Get a playback's details.",
+ "summary": "Control a playback.",
"nickname": "controlPlayback",
"responseClass": "void",
"parameters": [