Skip to content

Commit f25076a

Browse files
aoberoiaoberoi
committed
Merge branch 'aoberoi-issue-44'
2 parents 213c3b4 + 03cd303 commit f25076a

34 files changed

+154
-78
lines changed

‎docs/allclasses-frame.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:30 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:02 PDT 2014 -->
66
<title>All Classes (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/allclasses-noframe.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:30 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:02 PDT 2014 -->
66
<title>All Classes (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/Archive.Status.html

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>Archive.Status (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>
@@ -139,23 +139,29 @@ <h3>Enum Constant Summary</h3>
139139
</td>
140140
</tr>
141141
<tr class="altColor">
142+
<td class="colOne"><code><strong><a href="../../com/opentok/Archive.Status.html#EXPIRED">EXPIRED</a></strong></code>
143+
<div class="block">The archive file is no longer available at the OpenTok cloud.</div>
144+
</td>
145+
</tr>
146+
<tr class="rowColor">
142147
<td class="colOne"><code><strong><a href="../../com/opentok/Archive.Status.html#FAILED">FAILED</a></strong></code>
143148
<div class="block">The recording of the archive failed.</div>
144149
</td>
145150
</tr>
146-
<tr class="rowColor">
151+
<tr class="altColor">
147152
<td class="colOne"><code><strong><a href="../../com/opentok/Archive.Status.html#STARTED">STARTED</a></strong></code>
148153
<div class="block">The archive recording has started and is in progress.</div>
149154
</td>
150155
</tr>
151-
<tr class="altColor">
156+
<tr class="rowColor">
152157
<td class="colOne"><code><strong><a href="../../com/opentok/Archive.Status.html#STOPPED">STOPPED</a></strong></code>
153158
<div class="block">The archive recording has stopped, but the file is not available.</div>
154159
</td>
155160
</tr>
156-
<tr class="rowColor">
161+
<tr class="altColor">
157162
<td class="colOne"><code><strong><a href="../../com/opentok/Archive.Status.html#UPLOADED">UPLOADED</a></strong></code>
158-
<div class="block">The archive file is available at the target S3 bucket you set at the
163+
<div class="block">The archive file is available at the target Amazon S3 bucket
164+
or Windows Azure container you set at the
159165
<a href="https://dashboard.tokbox.com">OpenTok dashboard</a>.</div>
160166
</td>
161167
</tr>
@@ -274,14 +280,25 @@ <h4>STOPPED</h4>
274280
<a name="UPLOADED">
275281
<!-- -->
276282
</a>
277-
<ul class="blockListLast">
283+
<ul class="blockList">
278284
<li class="blockList">
279285
<h4>UPLOADED</h4>
280286
<pre>public static final&nbsp;<a href="../../com/opentok/Archive.Status.html" title="enum in com.opentok">Archive.Status</a> UPLOADED</pre>
281-
<div class="block">The archive file is available at the target S3 bucket you set at the
287+
<div class="block">The archive file is available at the target Amazon S3 bucket
288+
or Windows Azure container you set at the
282289
<a href="https://dashboard.tokbox.com">OpenTok dashboard</a>.</div>
283290
</li>
284291
</ul>
292+
<a name="EXPIRED">
293+
<!-- -->
294+
</a>
295+
<ul class="blockListLast">
296+
<li class="blockList">
297+
<h4>EXPIRED</h4>
298+
<pre>public static final&nbsp;<a href="../../com/opentok/Archive.Status.html" title="enum in com.opentok">Archive.Status</a> EXPIRED</pre>
299+
<div class="block">The archive file is no longer available at the OpenTok cloud.</div>
300+
</li>
301+
</ul>
285302
</li>
286303
</ul>
287304
<!-- ============ METHOD DETAIL ========== -->

‎docs/com/opentok/Archive.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>Archive (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/MediaMode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>MediaMode (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/OpenTok.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>OpenTok (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>
@@ -545,7 +545,9 @@ <h4>startArchive</h4>
545545
Clients must be actively connected to the OpenTok session for you to successfully start recording an archive.
546546
<p>
547547
You can only record one archive at a time for a given session. You can only record archives
548-
of sessions that uses the OpenTok Media Router; you cannot archive peer-to-peer sessions.</div>
548+
of sessions that use the OpenTok Media Router (sessions with the
549+
<a href="http://tokbox.com/opentok/tutorials/create-session/#media-mode">media mode</a>
550+
set to routed); you cannot archive sessions with the media mode set to relayed.</div>
549551
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>sessionId</code> - The session ID of the OpenTok session to archive.</dd><dd><code>name</code> - The name of the archive. You can use this name to identify the archive. It is a property
550552
of the Archive object, and it is a property of archive-related events in the OpenTok JavaScript SDK.</dd>
551553
<dt><span class="strong">Returns:</span></dt><dd>The Archive object. This object includes properties defining the archive, including the archive ID.</dd>

‎docs/com/opentok/Role.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>Role (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/Session.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:29 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>Session (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/SessionProperties.Builder.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:30 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>SessionProperties.Builder (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

‎docs/com/opentok/SessionProperties.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (version 1.7.0_40) on Mon Jun 16 22:23:30 PDT 2014 -->
5+
<!-- Generated by javadoc (version 1.7.0_40) on Thu Jun 19 22:39:01 PDT 2014 -->
66
<title>SessionProperties (OpenTok Java SDK Reference)</title>
7-
<meta name="date" content="2014-06-16">
7+
<meta name="date" content="2014-06-19">
88
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
99
</head>
1010
<body>

0 commit comments

Comments
 (0)