aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2019-02-12 15:20:58 -0800
committerManish Goregaokar <manishsmail@gmail.com>2019-02-13 10:04:52 -0800
commit407d88f97dd30f90c14dc3a5b59c7b4e803e8546 (patch)
tree2b3628d8cd18cdf2494d494fb82a682e23b262a7 /components/script/dom
parent1d8f7574d85b57b22b9d87e9cf3621887b7b474a (diff)
downloadservo-407d88f97dd30f90c14dc3a5b59c7b4e803e8546.tar.gz
servo-407d88f97dd30f90c14dc3a5b59c7b4e803e8546.zip
Update servo-media
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/trace.rs3
-rw-r--r--components/script/dom/mediadevices.rs4
-rw-r--r--components/script/dom/mediastream.rs2
-rw-r--r--components/script/dom/rtcpeerconnection.rs2
4 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 3e20fab1dcf..115ea0d4b28 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -101,7 +101,8 @@ use servo_media::audio::graph::NodeId;
use servo_media::audio::panner_node::{DistanceModel, PanningModel};
use servo_media::audio::param::ParamType;
use servo_media::player::Player;
-use servo_media::webrtc::{MediaStream as BackendMediaStream, WebRtcController};
+use servo_media::streams::MediaStream as BackendMediaStream;
+use servo_media::webrtc::WebRtcController;
use servo_media::Backend;
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
use smallvec::SmallVec;
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs
index e018087a86c..60b99c7fb23 100644
--- a/components/script/dom/mediadevices.rs
+++ b/components/script/dom/mediadevices.rs
@@ -43,12 +43,12 @@ impl MediaDevicesMethods for MediaDevices {
let media = ServoMedia::get().unwrap();
let mut tracks = vec![];
if constraints.audio {
- if let Some(audio) = media.create_audioinput_stream() {
+ if let Some(audio) = media.create_audioinput_stream(Default::default()) {
tracks.push(audio)
}
}
if constraints.video {
- if let Some(video) = media.create_videoinput_stream() {
+ if let Some(video) = media.create_videoinput_stream(Default::default()) {
tracks.push(video)
}
}
diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs
index 49550c97521..787c266637a 100644
--- a/components/script/dom/mediastream.rs
+++ b/components/script/dom/mediastream.rs
@@ -9,7 +9,7 @@ use crate::dom::bindings::root::DomRoot;
use crate::dom::eventtarget::EventTarget;
use crate::dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
-use servo_media::webrtc::MediaStream as BackendMediaStream;
+use servo_media::streams::MediaStream as BackendMediaStream;
use std::mem;
#[dom_struct]
diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
index 619721ca307..eb94914e588 100644
--- a/components/script/dom/rtcpeerconnection.rs
+++ b/components/script/dom/rtcpeerconnection.rs
@@ -34,7 +34,7 @@ use crate::task_source::networking::NetworkingTaskSource;
use crate::task_source::TaskSource;
use dom_struct::dom_struct;
-use servo_media::webrtc::MediaStream as BackendMediaStream;
+use servo_media::streams::MediaStream as BackendMediaStream;
use servo_media::webrtc::{
BundlePolicy, IceCandidate, SdpType, SessionDescription, WebRtcController, WebRtcSignaller,
};