Skip to content

Commit 3e4960b

Browse files
armanbilgearmanbilge
committed
Migrate mediastream to dom
1 parent 44e6292 commit 3e4960b

38 files changed

+673
-700
lines changed

‎api-reports/2_12.txt

Lines changed: 256 additions & 271 deletions
Large diffs are not rendered by default.

‎api-reports/2_13.txt

Lines changed: 256 additions & 271 deletions
Large diffs are not rendered by default.

‎src/main/scala/org/scalajs/dom/AudioContext.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.scalajs.dom
77

8-
import org.scalajs.dom.experimental.mediastream.MediaStream
98
import scala.scalajs.js
109
import scala.scalajs.js.annotation._
1110

‎src/main/scala/org/scalajs/dom/AudioTrackList.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import scala.scalajs.js
1111
@js.native
1212
trait AudioTrackList extends EventTarget with DOMList[AudioTrack] {
1313

14-
var onchange: js.Function1[js.Any, _] = js.native
15-
var onaddtrack: js.Function1[TrackEvent, _] = js.native
14+
var onchange: js.Function1[Event, Any] = js.native
15+
var onaddtrack: js.Function1[Event, Any] = js.native
16+
var onremovetrack: js.Function1[Event, Any] = js.native
1617

1718
def getTrackById(id: String): AudioTrack = js.native
1819
}

‎src/main/scala/org/scalajs/dom/HTMLMediaElement.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.scalajs.dom
88

9-
import org.scalajs.dom.experimental.mediastream.{MediaSource, MediaStream}
109
import scala.scalajs.js
1110
import scala.scalajs.js.annotation._
1211
import scala.scalajs.js.|

‎src/main/scala/org/scalajs/dom/experimental/mediastream/ImageCapture.scala renamed to ‎src/main/scala/org/scalajs/dom/ImageCapture.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaDeviceInfo.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaDeviceInfo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaDeviceKind.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaDeviceKind.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaDevices.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaDevices.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65

76
/** The MediaDevices interface provides access to connected media input devices like cameras and microphones, as well as

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaSource.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaSource.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

@@ -14,7 +13,7 @@ import scala.scalajs.js.annotation._
1413
class MediaSource extends EventTarget {
1514
def sourceBuffers: SourceBufferList = js.native
1615
def activeSourceBuffers: SourceBufferList = js.native
17-
def readyState: ReadyState = js.native
16+
def readyState: String = js.native
1817

1918
/** Allows the web application to set the presentation duration.
2019
*
@@ -28,7 +27,7 @@ class MediaSource extends EventTarget {
2827

2928
def addSourceBuffer(mimeType: String): SourceBuffer = js.native
3029
def removeSourceBuffer(sourceBuffer: SourceBuffer): Unit = js.native
31-
def endOfStream(error: EndOfStreamError = js.native): Unit = js.native
30+
def endOfStream(error: String = js.native): Unit = js.native
3231
def setLiveSeekableRange(start: Double, end: Double): Unit = js.native
3332
def clearLiveSeekableRange(): Unit = js.native
3433
}

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStream.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

‎src/main/scala/org/scalajs/dom/MediaStreamAudioDestinationNode.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.scalajs.dom
77

8-
import org.scalajs.dom.experimental.mediastream.MediaStream
98
import scala.scalajs.js
109

1110
/** The MediaElementAudioSourceNode interface represents an audio destination consisting of a WebRTC MediaStream with a

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStreamConstraints.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStreamConstraints.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55
import scala.scalajs.js.|

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStreamTrack.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStreamTrack.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65

76
@js.native

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStreamTrackEvent.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStreamTrackEvent.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStreamTrackEventInit.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStreamTrackEventInit.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65

76
trait MediaStreamTrackEventInit extends EventInit {

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStreamTrackState.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaStreamTrackState.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaTrackConstraintSet.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaTrackConstraintSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaTrackConstraints.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaTrackConstraints.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaTrackSettings.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaTrackSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaTrackSupportedConstraints.scala renamed to ‎src/main/scala/org/scalajs/dom/MediaTrackSupportedConstraints.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/SourceBuffer.scala renamed to ‎src/main/scala/org/scalajs/dom/SourceBuffer.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65

76
@js.native
87
trait SourceBuffer extends EventTarget {
9-
var mode: AppendMode = js.native
8+
var mode: String = js.native
109
var timestampOffset: Double = js.native
1110

1211
def updating: Boolean = js.native

‎src/main/scala/org/scalajs/dom/experimental/mediastream/SourceBufferList.scala renamed to ‎src/main/scala/org/scalajs/dom/SourceBufferList.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

‎src/main/scala/org/scalajs/dom/TextTrack.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import scala.scalajs.js.annotation._
1212
@js.native
1313
trait TextTrack extends EventTarget {
1414
var language: String = js.native
15-
var mode: js.Any = js.native
15+
var mode: String = js.native
1616
var readyState: Int = js.native
1717
var activeCues: TextTrackCueList = js.native
1818
var cues: TextTrackCueList = js.native
@@ -29,6 +29,12 @@ trait TextTrack extends EventTarget {
2929
var NONE: Int = js.native
3030
var HIDDEN: Int = js.native
3131
var DISABLED: Int = js.native
32+
33+
val id: String = js.native
34+
val inBandMetadataTrackDispatchType: String = js.native
35+
36+
def addCue(cue: TextTrackCue): Unit = js.native
37+
def removeCue(cue: TextTrackCue): Unit = js.native
3238
}
3339

3440
@js.native

‎src/main/scala/org/scalajs/dom/TextTrackList.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@ package org.scalajs.dom
99
import scala.scalajs.js
1010

1111
@js.native
12-
trait TextTrackList extends DOMList[TextTrack]
12+
trait TextTrackList extends DOMList[TextTrack] {
13+
def getTrackById(id: String): TextTrack = js.native
14+
15+
var onchange: js.Function1[Event, Any] = js.native
16+
var onaddtrack: js.Function1[Event, Any] = js.native
17+
var onremovetrack: js.Function1[Event, Any] = js.native
18+
}

‎src/main/scala/org/scalajs/dom/experimental/mediastream/VideoTrack.scala renamed to ‎src/main/scala/org/scalajs/dom/VideoTrack.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

44
import scala.scalajs.js
55

‎src/main/scala/org/scalajs/dom/experimental/mediastream/VideoTrackList.scala renamed to ‎src/main/scala/org/scalajs/dom/VideoTrackList.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

‎src/main/scala/org/scalajs/dom/experimental/mediastream/AudioTrack.scala

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/mediastream/AudioTrackList.scala

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/mediastream/TextTrack.scala

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/mediastream/TextTrackCue.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/mediastream/TextTrackCueList.scala

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/mediastream/TextTrackList.scala

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)