Clean up gtksink example imports a bit

This commit is contained in:
Sebastian Dröge 2017-08-07 14:18:24 +03:00
parent f1ac59a400
commit 8accac8d75
2 changed files with 10 additions and 12 deletions

16
Cargo.lock generated
View file

@ -105,7 +105,7 @@ dependencies = [
"gstreamer 0.1.0", "gstreamer 0.1.0",
"gstreamer-app 0.1.0", "gstreamer-app 0.1.0",
"gtk 0.1.3 (git+https://github.com/gtk-rs/gtk)", "gtk 0.1.3 (git+https://github.com/gtk-rs/gtk)",
"send-cell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "send-cell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "gdk" name = "gdk"
version = "0.5.3" version = "0.5.3"
source = "git+https://github.com/gtk-rs/gdk#049e8b74a2e1d47d3ce249b7793b4eef89334e05" source = "git+https://github.com/gtk-rs/gdk#cdb612c726c6b5e507534dcdd1dc549459b3869a"
dependencies = [ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo)", "cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo)",
@ -176,7 +176,7 @@ dependencies = [
[[package]] [[package]]
name = "gio" name = "gio"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/gtk-rs/gio#4c695845c70314577151162095bdc7441b24d14e" source = "git+https://github.com/gtk-rs/gio#2b2b061baf5c9410b3faac0fff28650dc773e750"
dependencies = [ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", "gio-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
@ -201,7 +201,7 @@ dependencies = [
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/gtk-rs/glib#8eacb1943939b8f037332cf91a7e79b41afbb989" source = "git+https://github.com/gtk-rs/glib#dc304963b10e8950b71a73ab7c9620c931ef7950"
dependencies = [ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
@ -288,7 +288,7 @@ dependencies = [
[[package]] [[package]]
name = "gtk" name = "gtk"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/gtk-rs/gtk#6f83f435aede3828431ff1fc1acc99cb39e0ad19" source = "git+https://github.com/gtk-rs/gtk#792b3342470bc3684f1a0fe5fca20fe106421c61"
dependencies = [ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo)", "cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo)",
@ -446,7 +446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/gtk-rs/pango#38905899513f934f65dea29914648092dc229d91" source = "git+https://github.com/gtk-rs/pango#df1ed7040f41aba0266fabf1c000e36d77c75106"
dependencies = [ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.1.3 (git+https://github.com/gtk-rs/glib)", "glib 0.1.3 (git+https://github.com/gtk-rs/glib)",
@ -485,7 +485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "send-cell" name = "send-cell"
version = "0.1.0" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -583,7 +583,7 @@ dependencies = [
"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
"checksum rustdoc-stripper 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ab70973988ecb752bc19e28e47bb3913bd98a8db8abe2dbd0f862067b176cf95" "checksum rustdoc-stripper 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ab70973988ecb752bc19e28e47bb3913bd98a8db8abe2dbd0f862067b176cf95"
"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
"checksum send-cell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a994a88c42f2b24f2426714696cffc90fe5dbc79b5043fa3676cd50cf3614df" "checksum send-cell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c620dd7e056b468b9d374a9f51cfa6bb4bf17a8ca4ee62e5efa0d99aaff2c41"
"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
"checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86" "checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86"
"checksum tokio-io 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c2c3ce9739f7387a0fa65b5421e81feae92e04d603f008898f4257790ce8c2db" "checksum tokio-io 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c2c3ce9739f7387a0fa65b5421e81feae92e04d603f008898f4257790ce8c2db"

View file

@ -5,12 +5,10 @@ extern crate glib;
use glib::*; use glib::*;
extern crate gio; extern crate gio;
use gio::ApplicationExt; use gio::*;
extern crate gtk; extern crate gtk;
use gtk::prelude::*; use gtk::prelude::*;
use gtk::{Window, WindowType};
use gtk::ApplicationExt as GtkApplicationExt;
use std::env; use std::env;
@ -37,7 +35,7 @@ fn create_ui(app: &gtk::Application) {
pipeline.add_many(&[&src, &sink]).unwrap(); pipeline.add_many(&[&src, &sink]).unwrap();
src.link(&sink).unwrap(); src.link(&sink).unwrap();
let window = Window::new(WindowType::Toplevel); let window = gtk::Window::new(gtk::WindowType::Toplevel);
window.set_default_size(320, 240); window.set_default_size(320, 240);
let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0); let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
vbox.pack_start(&widget, true, true, 0); vbox.pack_start(&widget, true, true, 0);