mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-27 14:01:04 +00:00
Code Issues Projects Releases Wiki Activity

threadshare: Fix deprecation warnings and move to released versions of tokio

Browse source
This commit is contained in:
Sebastian Dröge 2018-11-01 13:43:40 +02:00
parent 4e8c6fd293
commit 132986cf71
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-plugin-threadshare/Cargo.toml
View file

@ -11,11 +11,11 @@ glib = { git = "https://github.com/gtk-rs/glib" }
gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" } gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
gobject-subclass = { git = "https://github.com/gtk-rs/gobject-subclass" } gobject-subclass = { git = "https://github.com/gtk-rs/gobject-subclass" }
gst-plugin = { git = "https://github.com/sdroege/gst-plugin-rs" } gst-plugin = { git = "https://github.com/sdroege/gst-plugin-rs" }
tokio = { git = "https://github.com/tokio-rs/tokio" } tokio = "0.1"
tokio-reactor = { git = "https://github.com/tokio-rs/tokio" } tokio-reactor = "0.1"
tokio-executor = { git = "https://github.com/tokio-rs/tokio" } tokio-executor = "0.1"
tokio-timer = { git = "https://github.com/tokio-rs/tokio" } tokio-timer = "0.2"
tokio-current-thread = { git = "https://github.com/tokio-rs/tokio" } tokio-current-thread = "0.1"
futures = "0.1" futures = "0.1"
lazy_static = "1.0" lazy_static = "1.0"
either = "1.0" either = "1.0"

2
gst-plugin-threadshare/src/socket.rs
View file

@ -254,7 +254,7 @@ impl<T: SocketRead + 'static> Stream for SocketStream<T> {
} }
Err(err) => { Err(err) => {
gst_debug!(SOCKET_CAT, obj: &inner.element, "Failed to acquire buffer {:?}", err); gst_debug!(SOCKET_CAT, obj: &inner.element, "Failed to acquire buffer {:?}", err);
return Err(Either::Left(err.into_result().unwrap_err())); return Err(Either::Left(err));
} }
}, },
}; };

4
gst-plugin-threadshare/src/tcpclientsrc.rs
View file

@ -120,12 +120,12 @@ static PROPERTIES: [Property; 6] = [
]; ];
pub struct TcpClientReader { pub struct TcpClientReader {
connect_future: net::ConnectFuture, connect_future: net::tcp::ConnectFuture,
socket: Option<net::TcpStream>, socket: Option<net::TcpStream>,
} }
impl TcpClientReader { impl TcpClientReader {
pub fn new(connect_future: net::ConnectFuture) -> Self { pub fn new(connect_future: net::tcp::ConnectFuture) -> Self {
Self { Self {
connect_future: connect_future, connect_future: connect_future,
socket: None, socket: None,