Merge pull request #37 from sdroege/rust-2018

Switch to 2018 edition
This commit is contained in:
Ruben Gonzalez 2019-07-30 17:06:33 +02:00 committed by GitHub
commit 43eee4740b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 24 deletions

View file

@ -1,10 +1,11 @@
[package] [package]
name = "gst-plugin-ndi" name = "gst-plugin-ndi"
version = "1.0.0" version = "1.0.0"
authors = ["Ruben Gonzalez <rubenrua@teltek.es>", "Daniel Vilar <daniel.peiteado@teltek.es>"] authors = ["Ruben Gonzalez <rubenrua@teltek.es>", "Daniel Vilar <daniel.peiteado@teltek.es>", "Sebastian Dröge <sebastian@centricular.com>"]
repository = "https://github.com/teltek/gst-plugin-ndi" repository = "https://github.com/teltek/gst-plugin-ndi"
license = "LGPL" license = "LGPL"
description = "NewTek NDI Plugin" description = "NewTek NDI Plugin"
edition = "2018"
[dependencies] [dependencies]
glib = { version = "0.8.0", features = ["subclassing"] } glib = { version = "0.8.0", features = ["subclassing"] }

View file

@ -18,9 +18,9 @@ pub mod ndisys;
mod ndivideosrc; mod ndivideosrc;
pub mod receiver; pub mod receiver;
use ndi::*; use crate::ndi::*;
use ndisys::*; use crate::ndisys::*;
use receiver::*; use crate::receiver::*;
use std::collections::HashMap; use std::collections::HashMap;
use std::time; use std::time;

View file

@ -1,4 +1,4 @@
use ndisys::*; use crate::ndisys::*;
use std::ffi; use std::ffi;
use std::mem; use std::mem;
use std::ptr; use std::ptr;

View file

@ -1,6 +1,5 @@
use glib; use glib;
use glib::subclass; use glib::subclass;
use glib::subclass::prelude::*;
use gst; use gst;
use gst::prelude::*; use gst::prelude::*;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
@ -12,15 +11,15 @@ use gst_base::subclass::prelude::*;
use std::sync::Mutex; use std::sync::Mutex;
use std::{i32, u32}; use std::{i32, u32};
use connect_ndi; use crate::connect_ndi;
use ndisys; use crate::ndisys;
use AudioReceiver; use crate::AudioReceiver;
use Receiver; use crate::Receiver;
use ReceiverControlHandle; use crate::ReceiverControlHandle;
use ReceiverItem; use crate::ReceiverItem;
use TimestampMode; use crate::TimestampMode;
use DEFAULT_RECEIVER_NDI_NAME; use crate::DEFAULT_RECEIVER_NDI_NAME;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct Settings { struct Settings {

View file

@ -1,28 +1,26 @@
use glib; use glib;
use glib::subclass; use glib::subclass;
use glib::subclass::prelude::*;
use gst; use gst;
use gst::prelude::*; use gst::prelude::*;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
use gst_base; use gst_base;
use gst_base::prelude::*; use gst_base::prelude::*;
use gst_base::subclass::prelude::*; use gst_base::subclass::prelude::*;
use gst_video; use gst_video;
use std::sync::Mutex; use std::sync::Mutex;
use std::{i32, u32}; use std::{i32, u32};
use ndisys; use crate::ndisys;
use connect_ndi; use crate::connect_ndi;
use Receiver; use crate::Receiver;
use ReceiverControlHandle; use crate::ReceiverControlHandle;
use ReceiverItem; use crate::ReceiverItem;
use TimestampMode; use crate::TimestampMode;
use VideoReceiver; use crate::VideoReceiver;
use DEFAULT_RECEIVER_NDI_NAME; use crate::DEFAULT_RECEIVER_NDI_NAME;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct Settings { struct Settings {