[e] (0) Clarify these events.

git-svn-id: http://svn.whatwg.org/webapps@6011 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Apr 15, 2011 · 4bd0122 · 4bd0122
1 parent 4ca20b8
commit 4bd0122
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 26 deletions.
diff --git a/complete.html b/complete.html
@@ -33077,14 +33077,6 @@ <h5 id=mediaevents><span class=secno>4.8.10.16 </span>Event summary</h5>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent can render the <a href=#media-data>media data</a> at the <a href=#current-playback-position>current playback position</a> for the first time.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> newly increased to <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code> or greater for the first time.
-    <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
-     <td><code><a href=#event>Event</a></code>
-     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
-     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for two other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those two reasons do not fire this event: maybe <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>.
-    <tr><td><dfn id=event-media-playing title=event-media-playing><code>playing</code></dfn>
-     <td><code><a href=#event>Event</a></code>
-     <td>Playback has started.
-     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>, <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false, <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is false, or the <a href=#current-playback-position>current playback position</a> is contained in one of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>.
     <tr><td><dfn id=event-media-canplay title=event-media-canplay><code>canplay</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent can resume playback of the <a href=#media-data>media data</a>, but estimates that if playback were to be started now, the <a href=#media-resource>media resource</a> could not be rendered at the current playback rate up to its end without having to stop for further buffering of content.
@@ -33093,6 +33085,22 @@ <h5 id=mediaevents><span class=secno>4.8.10.16 </span>Event summary</h5>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent estimates that if playback were to be started now, the <a href=#media-resource>media resource</a> could be rendered at the current playback rate all the way to its end without having to stop for further buffering.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to <code title=dom-media-HAVE_ENOUGH_DATA><a href=#dom-media-have_enough_data>HAVE_ENOUGH_DATA</a></code>.
+    <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
+     <td><code><a href=#event>Event</a></code>
+     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
+     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those reasons do not fire this event: e.g.
+<!--CONTROLLER-->
+     one of the element's <a href=#current-media-controller>current media controller</a>'s other <a href=#slaved-media-elements>slaved media elements</a> is a newly <a href=#blocked-media-element>blocked media element</a>, or
+<!--CONTROLLER-->
+     <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>, or the element has <a href=#paused-for-user-interaction>paused for user interaction</a>.
+    <tr><td><dfn id=event-media-playing title=event-media-playing><code>playing</code></dfn>
+     <td><code><a href=#event>Event</a></code>
+     <td>Playback has started.
+     <td>The element is newly <a href=#potentially-playing>potentially playing</a>, either because <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>, or because <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is newly false. It is possible for playback to start without this event firing, e.g. if when playback would have started, 
+<!--CONTROLLER-->
+     one of the element's <a href=#current-media-controller>current media controller</a>'s other <a href=#slaved-media-elements>slaved media elements</a> was a <a href=#blocked-media-element>blocked media element</a>, or
+<!--CONTROLLER-->
+     the element had <a href=#paused-for-user-interaction>paused for user interaction</a> but the user has now made the necesary selection.
 
    <tbody><tr><td><dfn id=event-media-seeking title=event-media-seeking><code>seeking</code></dfn>
      <td><code><a href=#event>Event</a></code>

diff --git a/index b/index
@@ -33089,14 +33089,6 @@ interface <dfn id=texttrackcue>TextTrackCue</dfn> {
      <td><code><a href=#event>Event</a></code>
      <td>The user agent can render the <a href=#media-data>media data</a> at the <a href=#current-playback-position>current playback position</a> for the first time.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> newly increased to <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code> or greater for the first time.
-    <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
-     <td><code><a href=#event>Event</a></code>
-     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
-     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for two other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those two reasons do not fire this event: maybe <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>.
-    <tr><td><dfn id=event-media-playing title=event-media-playing><code>playing</code></dfn>
-     <td><code><a href=#event>Event</a></code>
-     <td>Playback has started.
-     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>, <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false, <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is false, or the <a href=#current-playback-position>current playback position</a> is contained in one of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>.
     <tr><td><dfn id=event-media-canplay title=event-media-canplay><code>canplay</code></dfn>
      <td><code><a href=#event>Event</a></code>
      <td>The user agent can resume playback of the <a href=#media-data>media data</a>, but estimates that if playback were to be started now, the <a href=#media-resource>media resource</a> could not be rendered at the current playback rate up to its end without having to stop for further buffering of content.
@@ -33105,6 +33097,22 @@ interface <dfn id=texttrackcue>TextTrackCue</dfn> {
      <td><code><a href=#event>Event</a></code>
      <td>The user agent estimates that if playback were to be started now, the <a href=#media-resource>media resource</a> could be rendered at the current playback rate all the way to its end without having to stop for further buffering.
      <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to <code title=dom-media-HAVE_ENOUGH_DATA><a href=#dom-media-have_enough_data>HAVE_ENOUGH_DATA</a></code>.
+    <tr><td><dfn id=event-media-waiting title=event-media-waiting><code>waiting</code></dfn>
+     <td><code><a href=#event>Event</a></code>
+     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
+     <td><code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is equal to or less than <code title=dom-media-HAVE_CURRENT_DATA><a href=#dom-media-have_current_data>HAVE_CURRENT_DATA</a></code>, and <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is false. Either <code title=dom-media-seeking><a href=#dom-media-seeking>seeking</a></code> is true, or the <a href=#current-playback-position>current playback position</a> is not contained in any of the ranges in <code title=dom-media-buffered><a href=#dom-media-buffered>buffered</a></code>. It is possible for playback to stop for other reasons without <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> being false, but those reasons do not fire this event: e.g.
+<!--CONTROLLER-->
+     one of the element's <a href=#current-media-controller>current media controller</a>'s other <a href=#slaved-media-elements>slaved media elements</a> is a newly <a href=#blocked-media-element>blocked media element</a>, or
+<!--CONTROLLER-->
+     <a href=#ended-playback title="ended playback">playback ended</a>, or playback <a href=#stopped-due-to-errors>stopped due to errors</a>, or the element has <a href=#paused-for-user-interaction>paused for user interaction</a>.
+    <tr><td><dfn id=event-media-playing title=event-media-playing><code>playing</code></dfn>
+     <td><code><a href=#event>Event</a></code>
+     <td>Playback has started.
+     <td>The element is newly <a href=#potentially-playing>potentially playing</a>, either because <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> is newly equal to or greater than <code title=dom-media-HAVE_FUTURE_DATA><a href=#dom-media-have_future_data>HAVE_FUTURE_DATA</a></code>, or because <code title=dom-media-paused><a href=#dom-media-paused>paused</a></code> is newly false. It is possible for playback to start without this event firing, e.g. if when playback would have started, 
+<!--CONTROLLER-->
+     one of the element's <a href=#current-media-controller>current media controller</a>'s other <a href=#slaved-media-elements>slaved media elements</a> was a <a href=#blocked-media-element>blocked media element</a>, or
+<!--CONTROLLER-->
+     the element had <a href=#paused-for-user-interaction>paused for user interaction</a> but the user has now made the necesary selection.
 
    <tbody><tr><td><dfn id=event-media-seeking title=event-media-seeking><code>seeking</code></dfn>
      <td><code><a href=#event>Event</a></code>

diff --git a/source b/source
@@ -36385,16 +36385,6 @@ interface <dfn>TextTrackCue</dfn> {
      <td><code>Event</code>
      <td>The user agent can render the <span>media data</span> at the <span>current playback position</span> for the first time.
      <td><code title="dom-media-readyState">readyState</code> newly increased to <code title="dom-media-HAVE_CURRENT_DATA">HAVE_CURRENT_DATA</code> or greater for the first time.
-    <tr>
-     <td><dfn title="event-media-waiting"><code>waiting</code></dfn>
-     <td><code>Event</code>
-     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
-     <td><code title="dom-media-readyState">readyState</code> is newly equal to or less than <code title="dom-media-HAVE_CURRENT_DATA">HAVE_CURRENT_DATA</code>, and <code title="dom-media-paused">paused</code> is false. Either <code title="dom-media-seeking">seeking</code> is true, or the <span>current playback position</span> is not contained in any of the ranges in <code title="dom-media-buffered">buffered</code>. It is possible for playback to stop for two other reasons without <code title="dom-media-paused">paused</code> being false, but those two reasons do not fire this event: maybe <span title="ended playback">playback ended</span>, or playback <span>stopped due to errors</span>.
-    <tr>
-     <td><dfn title="event-media-playing"><code>playing</code></dfn>
-     <td><code>Event</code>
-     <td>Playback has started.
-     <td><code title="dom-media-readyState">readyState</code> is newly equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA">HAVE_FUTURE_DATA</code>, <code title="dom-media-paused">paused</code> is false, <code title="dom-media-seeking">seeking</code> is false, or the <span>current playback position</span> is contained in one of the ranges in <code title="dom-media-buffered">buffered</code>.
     <tr>
      <td><dfn title="event-media-canplay"><code>canplay</code></dfn>
      <td><code>Event</code>
@@ -36405,6 +36395,24 @@ interface <dfn>TextTrackCue</dfn> {
      <td><code>Event</code>
      <td>The user agent estimates that if playback were to be started now, the <span>media resource</span> could be rendered at the current playback rate all the way to its end without having to stop for further buffering.
      <td><code title="dom-media-readyState">readyState</code> is newly equal to <code title="dom-media-HAVE_ENOUGH_DATA">HAVE_ENOUGH_DATA</code>.
+    <tr>
+     <td><dfn title="event-media-waiting"><code>waiting</code></dfn>
+     <td><code>Event</code>
+     <td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
+     <td><code title="dom-media-readyState">readyState</code> is equal to or less than <code title="dom-media-HAVE_CURRENT_DATA">HAVE_CURRENT_DATA</code>, and <code title="dom-media-paused">paused</code> is false. Either <code title="dom-media-seeking">seeking</code> is true, or the <span>current playback position</span> is not contained in any of the ranges in <code title="dom-media-buffered">buffered</code>. It is possible for playback to stop for other reasons without <code title="dom-media-paused">paused</code> being false, but those reasons do not fire this event: e.g.
+<!--END w3c-html--><!--CONTROLLER-->
+     one of the element's <span>current media controller</span>'s other <span>slaved media elements</span> is a newly <span>blocked media element</span>, or
+<!--START w3c-html--><!--CONTROLLER-->
+     <span title="ended playback">playback ended</span>, or playback <span>stopped due to errors</span>, or the element has <span>paused for user interaction</span>.
+    <tr>
+     <td><dfn title="event-media-playing"><code>playing</code></dfn>
+     <td><code>Event</code>
+     <td>Playback has started.
+     <td>The element is newly <span>potentially playing</span>, either because <code title="dom-media-readyState">readyState</code> is newly equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA">HAVE_FUTURE_DATA</code>, or because <code title="dom-media-paused">paused</code> is newly false. It is possible for playback to start without this event firing, e.g. if when playback would have started, 
+<!--END w3c-html--><!--CONTROLLER-->
+     one of the element's <span>current media controller</span>'s other <span>slaved media elements</span> was a <span>blocked media element</span>, or
+<!--START w3c-html--><!--CONTROLLER-->
+     the element had <span>paused for user interaction</span> but the user has now made the necesary selection.
 
    <tbody>
     <tr>