Update to nom 3.0, bitflags 0.9

This commit is contained in:
Sebastian Dröge 2017-06-06 13:28:50 +03:00
parent 340e8836bb
commit 94016c39b0
4 changed files with 25 additions and 25 deletions

View file

@ -9,7 +9,7 @@ license = "MIT/Apache-2.0"
url = "1.1" url = "1.1"
gst-plugin = { path="../gst-plugin" } gst-plugin = { path="../gst-plugin" }
slog = "2.0" slog = "2.0"
nom = "2.0" nom = "3.0"
flavors = {git = "https://github.com/Geal/flavors.git"} flavors = {git = "https://github.com/Geal/flavors.git"}
[lib] [lib]

View file

@ -9,7 +9,7 @@ license = "MIT/Apache-2.0"
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
url = "1.1" url = "1.1"
bitflags = "0.8" bitflags = "0.9"
slog = { version = "2.0", features = ["max_level_trace"] } slog = { version = "2.0", features = ["max_level_trace"] }
lazy_static = "0.2" lazy_static = "0.2"
byteorder = "1.0" byteorder = "1.0"

View file

@ -453,19 +453,19 @@ unsafe impl Send for ReadWriteMappedBuffer {}
// FIXME: Duplicate of gst::GstBufferFlags with nicer naming // FIXME: Duplicate of gst::GstBufferFlags with nicer naming
bitflags! { bitflags! {
#[repr(C)] #[repr(C)]
pub flags BufferFlags: u32 { pub struct BufferFlags: u32 {
const BUFFER_FLAG_LIVE = 0b0000000000010000, const BUFFER_FLAG_LIVE = 0b0000000000010000;
const BUFFER_FLAG_DECODE_ONLY = 0b0000000000100000, const BUFFER_FLAG_DECODE_ONLY = 0b0000000000100000;
const BUFFER_FLAG_DISCONT = 0b0000000001000000, const BUFFER_FLAG_DISCONT = 0b0000000001000000;
const BUFFER_FLAG_RESYNC = 0b0000000010000000, const BUFFER_FLAG_RESYNC = 0b0000000010000000;
const BUFFER_FLAG_CORRUPTED = 0b0000000100000000, const BUFFER_FLAG_CORRUPTED = 0b0000000100000000;
const BUFFER_FLAG_MARKER = 0b0000001000000000, const BUFFER_FLAG_MARKER = 0b0000001000000000;
const BUFFER_FLAG_HEADER = 0b0000010000000000, const BUFFER_FLAG_HEADER = 0b0000010000000000;
const BUFFER_FLAG_GAP = 0b0000100000000000, const BUFFER_FLAG_GAP = 0b0000100000000000;
const BUFFER_FLAG_DROPPABLE = 0b0001000000000000, const BUFFER_FLAG_DROPPABLE = 0b0001000000000000;
const BUFFER_FLAG_DELTA_UNIT = 0b0010000000000000, const BUFFER_FLAG_DELTA_UNIT = 0b0010000000000000;
const BUFFER_FLAG_TAG_MEMORY = 0b0100000000000000, const BUFFER_FLAG_TAG_MEMORY = 0b0100000000000000;
const BUFFER_FLAG_SYNC_AFTER = 0b1000000000000000, const BUFFER_FLAG_SYNC_AFTER = 0b1000000000000000;
} }
} }

View file

@ -20,21 +20,21 @@ pub struct StreamCollection(*mut gst::GstStreamCollection);
bitflags! { bitflags! {
#[repr(C)] #[repr(C)]
pub flags StreamType: u32 { pub struct StreamType: u32 {
const TYPE_UNKNOWN = 0b00000001, const TYPE_UNKNOWN = 0b00000001;
const TYPE_AUDIO = 0b00000010, const TYPE_AUDIO = 0b00000010;
const TYPE_VIDEO = 0b00000100, const TYPE_VIDEO = 0b00000100;
const TYPE_CONTAINER = 0b00001000, const TYPE_CONTAINER = 0b00001000;
const TYPE_TEXT = 0b00010000, const TYPE_TEXT = 0b00010000;
} }
} }
bitflags! { bitflags! {
#[repr(C)] #[repr(C)]
pub flags StreamFlags: u32 { pub struct StreamFlags: u32 {
const FLAG_SPARSE = 0b00000001, const FLAG_SPARSE = 0b00000001;
const FLAG_SELECT = 0b00000010, const FLAG_SELECT = 0b00000010;
const FLAG_UNSELECT = 0b00000100, const FLAG_UNSELECT = 0b00000100;
} }
} }