From 7f8dfda9a76069741b448ca029d273c68ef98e38 Mon Sep 17 00:00:00 2001
From: Gabriel Garcia <garciat@live.com>
Date: Fri, 24 Jul 2015 18:34:16 -0400
Subject: [PATCH] Fix test cases

---
 webrtc/MediaStream-tests.ts | 28 ++++++++++++--------------
 webrtc/MediaStream.d.ts     | 40 +++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/webrtc/MediaStream-tests.ts b/webrtc/MediaStream-tests.ts
index 0d4e710b83..516abcb028 100644
--- a/webrtc/MediaStream-tests.ts
+++ b/webrtc/MediaStream-tests.ts
@@ -2,16 +2,16 @@
 var mediaStreamConstraints: MediaStreamConstraints = { audio: true, video: true };
 
 var mediaTrackConstraintSet: MediaTrackConstraintSet = {};
-var mediaTrackConstraintArray: MediaTrackConstraint[] = [];
+var mediaTrackConstraintArray: MediaTrackConstraintSet[] = [];
 var mediaTrackConstraints: MediaTrackConstraints = { mandatory: mediaTrackConstraintSet, optional: mediaTrackConstraintArray }
 
 navigator.getUserMedia(mediaStreamConstraints,
   stream => {
-    console.log('label:' + stream.label);
-    console.log('ended:' + stream.ended);
-    stream.onended = (event:Event) => console.log('Stream ended');
+    var track: MediaStreamTrack = stream.getTracks()[0];
+    console.log('label:' + track.label);
+    console.log('ended:' + track.readyState);
+    track.onended = (event:Event) => console.log('Track ended');
     var objectUrl = URL.createObjectURL(stream);
-    var wkObjectUrl = webkitURL.createObjectURL(stream);
   },
   error => {
     console.log('Error message: ' + error.message);
@@ -20,12 +20,11 @@ navigator.getUserMedia(mediaStreamConstraints,
 
 navigator.webkitGetUserMedia(mediaStreamConstraints,
   stream => {
-    console.log('label:' + stream.label);
-    console.log('ended:' + stream.ended);
-    stream.onended = (event:Event) => console.log('Stream ended');
-    stream.addEventListener("ended", (event:Event) => console.log('Stream ended'));
+    var track: MediaStreamTrack = stream.getTracks()[0];
+    console.log('label:' + track.label);
+    console.log('ended:' + track.readyState);
+    track.onended = (event:Event) => console.log('Track ended');
     var objectUrl = URL.createObjectURL(stream);
-    var wkObjectUrl = webkitURL.createObjectURL(stream);
   },
   error => {
     console.log('Error message: ' + error.message);
@@ -35,12 +34,11 @@ navigator.webkitGetUserMedia(mediaStreamConstraints,
 
 navigator.mozGetUserMedia(mediaStreamConstraints,
   stream => {
-    console.log('label:' + stream.label);
-    console.log('ended:' + stream.ended);
-    stream.onended = (event:Event) => console.log('Stream ended');
-    stream.addEventListener("ended", (event:Event) => console.log('Stream ended'));
+    var track: MediaStreamTrack = stream.getTracks()[0];
+    console.log('label:' + track.label);
+    console.log('ended:' + track.readyState);
+    track.onended = (event:Event) => console.log('Track ended');
     var objectUrl = URL.createObjectURL(stream);
-    var wkObjectUrl = webkitURL.createObjectURL(stream);
   },
   error => {
     console.log('Error message: ' + error.message);
diff --git a/webrtc/MediaStream.d.ts b/webrtc/MediaStream.d.ts
index 6db34de949..f52551a146 100644
--- a/webrtc/MediaStream.d.ts
+++ b/webrtc/MediaStream.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 // Taken from http://dev.w3.org/2011/webrtc/editor/getusermedia.html
+// version: W3C Editor's Draft 29 June 2015
 
 /// <reference path="../es6-promise/es6-promise.d.ts" />
 
@@ -32,10 +33,6 @@ interface MediaStreamConstraints {
     audio?: boolean | MediaTrackConstraints;
 }
 
-interface MediaTrackConstraints {
-    advanced: MediaTrackConstraintSet[];
-}
-
 declare module W3C {
     type LongRange = NumberRange;
     type DoubleRange = NumberRange;
@@ -46,19 +43,23 @@ declare module W3C {
     type ConstrainString = string | string[] | ConstrainStringParameters;
 }
 
+interface MediaTrackConstraints extends MediaTrackConstraintSet {
+    advanced?: MediaTrackConstraintSet[];
+}
+
 interface MediaTrackConstraintSet {
-    width: W3C.ConstrainLong;
-    height: W3C.ConstrainLong;
-    aspectRatio: W3C.ConstrainDouble;
-    frameRate: W3C.ConstrainDouble;
-    facingMode: W3C.ConstrainString;
-    volume: W3C.ConstrainDouble;
-    sampleRate: W3C.ConstrainLong;
-    sampleSize: W3C.ConstrainLong;
-    echoCancellation: W3C.ConstrainBoolean;
-    latency: W3C.ConstrainDouble;
-    deviceId: W3C.ConstrainString;
-    groupId: W3C.ConstrainString;
+    width?: W3C.ConstrainLong;
+    height?: W3C.ConstrainLong;
+    aspectRatio?: W3C.ConstrainDouble;
+    frameRate?: W3C.ConstrainDouble;
+    facingMode?: W3C.ConstrainString;
+    volume?: W3C.ConstrainDouble;
+    sampleRate?: W3C.ConstrainLong;
+    sampleSize?: W3C.ConstrainLong;
+    echoCancellation?: W3C.ConstrainBoolean;
+    latency?: W3C.ConstrainDouble;
+    deviceId?: W3C.ConstrainString;
+    groupId?: W3C.ConstrainString;
 }
 
 interface MediaTrackSupportedConstraints {
@@ -102,6 +103,11 @@ interface MediaStreamTrackEvent extends Event {
     track: MediaStreamTrack;
 }
 
+declare enum MediaStreamTrackState {
+	"live",
+    "ended"
+}
+
 interface MediaStreamTrack extends EventTarget {
     id: string;
     kind: string;
@@ -109,7 +115,7 @@ interface MediaStreamTrack extends EventTarget {
     enabled: boolean;
     muted: boolean;
     remote: boolean;
-    readyState: string;
+    readyState: MediaStreamTrackState;
     
     onmute: EventListener;
     onunmute: EventListener;