From 80a0bfbc8d0032013ddd01be509b32fa3afb406f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 9 Apr 2017 21:10:14 +0300
Subject: [PATCH] Update to latest GIR and depend on GIT versions of
 glib-sys/gobject-sys

This now generates untruncated structs for almost everything.
---
 gstreamer-audio-sys/Cargo.toml   |   4 +-
 gstreamer-audio-sys/src/lib.rs   |  90 +++++-----
 gstreamer-base-sys/Cargo.toml    |   4 +-
 gstreamer-base-sys/src/lib.rs    | 125 +++++++------
 gstreamer-pbutils-sys/Cargo.toml |   4 +-
 gstreamer-pbutils-sys/src/lib.rs |   8 +-
 gstreamer-sys/Cargo.toml         |   4 +-
 gstreamer-sys/src/lib.rs         | 296 +++++++++++++++----------------
 gstreamer-tag-sys/Cargo.toml     |   4 +-
 gstreamer-tag-sys/src/lib.rs     |  16 +-
 gstreamer-video-sys/Cargo.toml   |   4 +-
 gstreamer-video-sys/src/lib.rs   |  91 +++++-----
 12 files changed, 320 insertions(+), 330 deletions(-)

diff --git a/gstreamer-audio-sys/Cargo.toml b/gstreamer-audio-sys/Cargo.toml
index 98ef94ac9..9147e3f3c 100644
--- a/gstreamer-audio-sys/Cargo.toml
+++ b/gstreamer-audio-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
diff --git a/gstreamer-audio-sys/src/lib.rs b/gstreamer-audio-sys/src/lib.rs
index 6fb1da49f..b857fe817 100644
--- a/gstreamer-audio-sys/src/lib.rs
+++ b/gstreamer-audio-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -14,7 +14,7 @@ extern crate gstreamer_tag_sys as gst_tag;
 #[allow(unused_imports)]
 use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
     c_short, c_ushort, c_long, c_ulong,
-    c_void, size_t, ssize_t, time_t, FILE};
+    c_void, size_t, ssize_t, intptr_t, uintptr_t, time_t, FILE};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType, Volatile};
@@ -468,7 +468,7 @@ pub struct GstAudioBaseSinkClass {
     pub parent_class: gst_base::GstBaseSinkClass,
     pub create_ringbuffer: Option<unsafe extern "C" fn(*mut GstAudioBaseSink) -> *mut GstAudioRingBuffer>,
     pub payload: Option<unsafe extern "C" fn(*mut GstAudioBaseSink, *mut gst::GstBuffer) -> *mut gst::GstBuffer>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -478,7 +478,7 @@ pub struct GstAudioBaseSinkPrivate(c_void);
 pub struct GstAudioBaseSrcClass {
     pub parent_class: gst_base::GstPushSrcClass,
     pub create_ringbuffer: Option<unsafe extern "C" fn(*mut GstAudioBaseSrc) -> *mut GstAudioRingBuffer>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -490,7 +490,7 @@ pub struct GstAudioCdSrcClass {
     pub open: Option<unsafe extern "C" fn(*mut GstAudioCdSrc, *const c_char) -> gboolean>,
     pub close: Option<unsafe extern "C" fn(*mut GstAudioCdSrc)>,
     pub read_sector: Option<unsafe extern "C" fn(*mut GstAudioCdSrc, c_int) -> *mut gst::GstBuffer>,
-    _gst_reserved: [gpointer; 20],
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
@@ -503,8 +503,8 @@ pub struct GstAudioCdSrcTrack {
     pub start: c_uint,
     pub end: c_uint,
     pub tags: *mut gst::GstTagList,
-    _gst_reserved1: [c_uint; 2],
-    _gst_reserved2: [gpointer; 2],
+    pub _gst_reserved1: [c_uint; 2],
+    pub _gst_reserved2: [gpointer; 2],
 }
 
 #[repr(C)]
@@ -521,7 +521,7 @@ pub struct GstAudioClippingMeta {
 #[repr(C)]
 pub struct GstAudioClockClass {
     pub parent_class: gst::GstSystemClockClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -548,7 +548,7 @@ pub struct GstAudioDecoderClass {
     pub src_query: Option<unsafe extern "C" fn(*mut GstAudioDecoder, *mut gst::GstQuery) -> gboolean>,
     pub getcaps: Option<unsafe extern "C" fn(*mut GstAudioDecoder, *mut gst::GstCaps) -> *mut gst::GstCaps>,
     pub transform_meta: Option<unsafe extern "C" fn(*mut GstAudioDecoder, *mut gst::GstBuffer, *mut gst::GstMeta, *mut gst::GstBuffer) -> gboolean>,
-    _gst_reserved: [gpointer; 16],
+    pub _gst_reserved: [gpointer; 16],
 }
 
 #[repr(C)]
@@ -584,7 +584,7 @@ pub struct GstAudioEncoderClass {
     pub transform_meta: Option<unsafe extern "C" fn(*mut GstAudioEncoder, *mut gst::GstBuffer, *mut gst::GstMeta, *mut gst::GstBuffer) -> gboolean>,
     pub sink_query: Option<unsafe extern "C" fn(*mut GstAudioEncoder, *mut gst::GstQuery) -> gboolean>,
     pub src_query: Option<unsafe extern "C" fn(*mut GstAudioEncoder, *mut gst::GstQuery) -> gboolean>,
-    _gst_reserved: [gpointer; 17],
+    pub _gst_reserved: [gpointer; 17],
 }
 
 #[repr(C)]
@@ -594,7 +594,7 @@ pub struct GstAudioEncoderPrivate(c_void);
 pub struct GstAudioFilterClass {
     pub basetransformclass: gst_base::GstBaseTransformClass,
     pub setup: Option<unsafe extern "C" fn(*mut GstAudioFilter, *const GstAudioInfo) -> gboolean>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -610,7 +610,7 @@ pub struct GstAudioFormatInfo {
     pub unpack_format: GstAudioFormat,
     pub unpack_func: GstAudioFormatUnpack,
     pub pack_func: GstAudioFormatPack,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -622,7 +622,7 @@ pub struct GstAudioInfo {
     pub channels: c_int,
     pub bpf: c_int,
     pub position: [GstAudioChannelPosition; 64],
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -646,7 +646,7 @@ pub struct GstAudioRingBufferClass {
     pub activate: Option<unsafe extern "C" fn(*mut GstAudioRingBuffer, gboolean) -> gboolean>,
     pub commit: Option<unsafe extern "C" fn(*mut GstAudioRingBuffer, *mut u64, *mut u8, c_int, c_int, *mut c_int) -> c_uint>,
     pub clear_all: Option<unsafe extern "C" fn(*mut GstAudioRingBuffer)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -659,7 +659,7 @@ pub struct GstAudioRingBufferSpec {
     pub segsize: c_int,
     pub segtotal: c_int,
     pub seglatency: c_int,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -672,7 +672,7 @@ pub struct GstAudioSinkClass {
     pub write: Option<unsafe extern "C" fn(*mut GstAudioSink, gpointer, c_uint) -> c_int>,
     pub delay: Option<unsafe extern "C" fn(*mut GstAudioSink) -> c_uint>,
     pub reset: Option<unsafe extern "C" fn(*mut GstAudioSink)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -685,7 +685,7 @@ pub struct GstAudioSrcClass {
     pub read: Option<unsafe extern "C" fn(*mut GstAudioSrc, gpointer, c_uint, *mut gst::GstClockTime) -> c_uint>,
     pub delay: Option<unsafe extern "C" fn(*mut GstAudioSrc) -> c_uint>,
     pub reset: Option<unsafe extern "C" fn(*mut GstAudioSrc)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -703,8 +703,8 @@ pub struct GstAudioBaseSink {
     pub next_sample: u64,
     pub provided_clock: *mut gst::GstClock,
     pub eos_rendering: gboolean,
-    priv_: *mut GstAudioBaseSinkPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstAudioBaseSinkPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -715,17 +715,17 @@ pub struct GstAudioBaseSrc {
     pub latency_time: gst::GstClockTime,
     pub next_sample: u64,
     pub clock: *mut gst::GstClock,
-    priv_: *mut GstAudioBaseSrcPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstAudioBaseSrcPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstAudioCdSrc {
     pub pushsrc: gst_base::GstPushSrc,
     pub tags: *mut gst::GstTagList,
-    priv_: *mut GstAudioCdSrcPrivate,
-    _gst_reserved1: [c_uint; 2],
-    _gst_reserved2: [gpointer; 2],
+    pub priv_: *mut GstAudioCdSrcPrivate,
+    pub _gst_reserved1: [c_uint; 2],
+    pub _gst_reserved2: [gpointer; 2],
 }
 
 #[repr(C)]
@@ -734,9 +734,9 @@ pub struct GstAudioClock {
     pub func: GstAudioClockGetTimeFunc,
     pub user_data: gpointer,
     pub destroy_notify: glib::GDestroyNotify,
-    last_time: gst::GstClockTime,
-    time_offset: gst::GstClockTimeDiff,
-    _gst_reserved: [gpointer; 4],
+    pub last_time: gst::GstClockTime,
+    pub time_offset: gst::GstClockTimeDiff,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -747,8 +747,8 @@ pub struct GstAudioDecoder {
     pub stream_lock: glib::GRecMutex,
     pub input_segment: gst::GstSegment,
     pub output_segment: gst::GstSegment,
-    priv_: *mut GstAudioDecoderPrivate,
-    _gst_reserved: [gpointer; 20],
+    pub priv_: *mut GstAudioDecoderPrivate,
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
@@ -759,15 +759,15 @@ pub struct GstAudioEncoder {
     pub stream_lock: glib::GRecMutex,
     pub input_segment: gst::GstSegment,
     pub output_segment: gst::GstSegment,
-    priv_: *mut GstAudioEncoderPrivate,
-    _gst_reserved: [gpointer; 20],
+    pub priv_: *mut GstAudioEncoderPrivate,
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
 pub struct GstAudioFilter {
     pub basetransform: gst_base::GstBaseTransform,
     pub info: GstAudioInfo,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -786,29 +786,29 @@ pub struct GstAudioRingBuffer {
     pub segdone: c_int,
     pub segbase: c_int,
     pub waiting: c_int,
-    callback: GstAudioRingBufferCallback,
-    cb_data: gpointer,
-    need_reorder: gboolean,
-    channel_reorder_map: [c_int; 64],
-    flushing: gboolean,
-    may_start: c_int,
-    active: gboolean,
-    cb_data_notify: glib::GDestroyNotify,
-    _gst_reserved: [gpointer; 3],
+    pub callback: GstAudioRingBufferCallback,
+    pub cb_data: gpointer,
+    pub need_reorder: gboolean,
+    pub channel_reorder_map: [c_int; 64],
+    pub flushing: gboolean,
+    pub may_start: c_int,
+    pub active: gboolean,
+    pub cb_data_notify: glib::GDestroyNotify,
+    pub _gst_reserved: [gpointer; 3],
 }
 
 #[repr(C)]
 pub struct GstAudioSink {
     pub element: GstAudioBaseSink,
-    thread: *mut glib::GThread,
-    _gst_reserved: [gpointer; 4],
+    pub thread: *mut glib::GThread,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstAudioSrc {
     pub element: GstAudioBaseSrc,
-    thread: *mut glib::GThread,
-    _gst_reserved: [gpointer; 4],
+    pub thread: *mut glib::GThread,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 // Interfaces
diff --git a/gstreamer-base-sys/Cargo.toml b/gstreamer-base-sys/Cargo.toml
index a477fa7a9..013ec548b 100644
--- a/gstreamer-base-sys/Cargo.toml
+++ b/gstreamer-base-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
diff --git a/gstreamer-base-sys/src/lib.rs b/gstreamer-base-sys/src/lib.rs
index 2dd2307df..e59d6ea7f 100644
--- a/gstreamer-base-sys/src/lib.rs
+++ b/gstreamer-base-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -12,7 +12,7 @@ extern crate gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
     c_short, c_ushort, c_long, c_ulong,
-    c_void, size_t, ssize_t, time_t, FILE};
+    c_void, size_t, ssize_t, intptr_t, uintptr_t, time_t, FILE};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType, Volatile};
@@ -89,7 +89,7 @@ pub struct GstBaseParseClass {
     pub detect: Option<unsafe extern "C" fn(*mut GstBaseParse, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub sink_query: Option<unsafe extern "C" fn(*mut GstBaseParse, *mut gst::GstQuery) -> gboolean>,
     pub src_query: Option<unsafe extern "C" fn(*mut GstBaseParse, *mut gst::GstQuery) -> gboolean>,
-    _gst_reserved: [gpointer; 18],
+    pub _gst_reserved: [gpointer; 18],
 }
 
 #[repr(C)]
@@ -99,10 +99,10 @@ pub struct GstBaseParseFrame {
     pub flags: c_uint,
     pub offset: u64,
     pub overhead: c_int,
-    size: c_int,
-    _gst_reserved_i: [c_uint; 2],
-    _gst_reserved_p: [gpointer; 2],
-    _private_flags: c_uint,
+    pub size: c_int,
+    pub _gst_reserved_i: [c_uint; 2],
+    pub _gst_reserved_p: [gpointer; 2],
+    pub _private_flags: c_uint,
 }
 
 #[repr(C)]
@@ -129,7 +129,7 @@ pub struct GstBaseSinkClass {
     pub preroll: Option<unsafe extern "C" fn(*mut GstBaseSink, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub render: Option<unsafe extern "C" fn(*mut GstBaseSink, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub render_list: Option<unsafe extern "C" fn(*mut GstBaseSink, *mut gst::GstBufferList) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 20],
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
@@ -157,7 +157,7 @@ pub struct GstBaseSrcClass {
     pub create: Option<unsafe extern "C" fn(*mut GstBaseSrc, u64, c_uint, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub alloc: Option<unsafe extern "C" fn(*mut GstBaseSrc, u64, c_uint, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub fill: Option<unsafe extern "C" fn(*mut GstBaseSrc, u64, c_uint, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 20],
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
@@ -190,7 +190,7 @@ pub struct GstBaseTransformClass {
     pub transform_ip: Option<unsafe extern "C" fn(*mut GstBaseTransform, *mut *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub submit_input_buffer: Option<unsafe extern "C" fn(*mut GstBaseTransform, gboolean, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub generate_output: Option<unsafe extern "C" fn(*mut GstBaseTransform, *mut *mut gst::GstBuffer) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 18],
+    pub _gst_reserved: [gpointer; 18],
 }
 
 #[repr(C)]
@@ -202,7 +202,7 @@ pub struct GstBitReader {
     pub size: c_uint,
     pub byte: c_uint,
     pub bit: c_uint,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -210,7 +210,7 @@ pub struct GstByteReader {
     pub data: *mut u8,
     pub size: c_uint,
     pub byte: c_uint,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -219,7 +219,7 @@ pub struct GstByteWriter {
     pub alloc_size: c_uint,
     pub fixed: gboolean,
     pub owned: gboolean,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -229,10 +229,9 @@ pub struct GstCollectData {
     pub buffer: *mut gst::GstBuffer,
     pub pos: c_uint,
     pub segment: gst::GstSegment,
-    state: GstCollectPadsStateFlags,
-    priv_: *mut GstCollectDataPrivate,
-    _truncated_record_marker: c_void,
-    //union,
+    pub state: GstCollectPadsStateFlags,
+    pub priv_: *mut GstCollectDataPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -241,7 +240,7 @@ pub struct GstCollectDataPrivate(c_void);
 #[repr(C)]
 pub struct GstCollectPadsClass {
     pub parent_class: gst::GstObjectClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -262,7 +261,7 @@ pub struct GstDataQueueItem {
     pub duration: u64,
     pub visible: gboolean,
     pub destroy: glib::GDestroyNotify,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -284,7 +283,7 @@ pub struct GstPushSrcClass {
     pub create: Option<unsafe extern "C" fn(*mut GstPushSrc, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub alloc: Option<unsafe extern "C" fn(*mut GstPushSrc, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
     pub fill: Option<unsafe extern "C" fn(*mut GstPushSrc, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -301,8 +300,8 @@ pub struct GstBaseParse {
     pub srcpad: *mut gst::GstPad,
     pub flags: c_uint,
     pub segment: gst::GstSegment,
-    _gst_reserved: [gpointer; 20],
-    priv_: *mut GstBaseParsePrivate,
+    pub _gst_reserved: [gpointer; 20],
+    pub priv_: *mut GstBaseParsePrivate,
 }
 
 #[repr(C)]
@@ -313,46 +312,44 @@ pub struct GstBaseSink {
     pub offset: u64,
     pub can_activate_pull: gboolean,
     pub can_activate_push: gboolean,
-    _truncated_record_marker: c_void,
-    //union,
-    //preroll_cond: GCond,
-    //eos: gboolean,
-    //need_preroll: gboolean,
-    //have_preroll: gboolean,
-    //playing_async: gboolean,
-    //have_newsegment: gboolean,
-    //segment: GstSegment,
-    //clock_id: GstClockID,
-    //sync: gboolean,
-    //flushing: gboolean,
-    //running: gboolean,
-    //max_lateness: gint64,
-    //priv: GstBaseSinkPrivate*,
-    //_gst_reserved: gpointer,
+    pub preroll_lock: glib::GMutex,
+    pub preroll_cond: glib::GCond,
+    pub eos: gboolean,
+    pub need_preroll: gboolean,
+    pub have_preroll: gboolean,
+    pub playing_async: gboolean,
+    pub have_newsegment: gboolean,
+    pub segment: gst::GstSegment,
+    pub clock_id: gst::GstClockID,
+    pub sync: gboolean,
+    pub flushing: gboolean,
+    pub running: gboolean,
+    pub max_lateness: i64,
+    pub priv_: *mut GstBaseSinkPrivate,
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
 pub struct GstBaseSrc {
     pub element: gst::GstElement,
     pub srcpad: *mut gst::GstPad,
-    _truncated_record_marker: c_void,
-    //union,
-    //live_cond: GCond,
-    //is_live: gboolean,
-    //live_running: gboolean,
-    //blocksize: guint,
-    //can_activate_push: gboolean,
-    //random_access: gboolean,
-    //clock_id: GstClockID,
-    //segment: GstSegment,
-    //need_newsegment: gboolean,
-    //num_buffers: gint,
-    //num_buffers_left: gint,
-    //typefind: gboolean,
-    //running: gboolean,
-    //pending_seek: GstEvent*,
-    //priv: GstBaseSrcPrivate*,
-    //_gst_reserved: gpointer,
+    pub live_lock: glib::GMutex,
+    pub live_cond: glib::GCond,
+    pub is_live: gboolean,
+    pub live_running: gboolean,
+    pub blocksize: c_uint,
+    pub can_activate_push: gboolean,
+    pub random_access: gboolean,
+    pub clock_id: gst::GstClockID,
+    pub segment: gst::GstSegment,
+    pub need_newsegment: gboolean,
+    pub num_buffers: c_int,
+    pub num_buffers_left: c_int,
+    pub typefind: gboolean,
+    pub running: gboolean,
+    pub pending_seek: *mut gst::GstEvent,
+    pub priv_: *mut GstBaseSrcPrivate,
+    pub _gst_reserved: [gpointer; 20],
 }
 
 #[repr(C)]
@@ -363,30 +360,30 @@ pub struct GstBaseTransform {
     pub have_segment: gboolean,
     pub segment: gst::GstSegment,
     pub queued_buf: *mut gst::GstBuffer,
-    priv_: *mut GstBaseTransformPrivate,
-    _gst_reserved: [gpointer; 19],
+    pub priv_: *mut GstBaseTransformPrivate,
+    pub _gst_reserved: [gpointer; 19],
 }
 
 #[repr(C)]
 pub struct GstCollectPads {
     pub object: gst::GstObject,
     pub data: *mut glib::GSList,
-    stream_lock: glib::GRecMutex,
-    priv_: *mut GstCollectPadsPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub stream_lock: glib::GRecMutex,
+    pub priv_: *mut GstCollectPadsPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstDataQueue {
     pub object: gobject::GObject,
-    priv_: *mut GstDataQueuePrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstDataQueuePrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstPushSrc {
     pub parent: GstBaseSrc,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 extern "C" {
diff --git a/gstreamer-pbutils-sys/Cargo.toml b/gstreamer-pbutils-sys/Cargo.toml
index 7c724ffa7..52d13e3c8 100644
--- a/gstreamer-pbutils-sys/Cargo.toml
+++ b/gstreamer-pbutils-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
diff --git a/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils-sys/src/lib.rs
index fd3a58734..077fcf905 100644
--- a/gstreamer-pbutils-sys/src/lib.rs
+++ b/gstreamer-pbutils-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f+) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -173,14 +173,14 @@ pub struct GstAudioVisualizer {
     pub req_spf: c_uint,
     pub vinfo: gst_video::GstVideoInfo,
     pub ainfo: gst_audio::GstAudioInfo,
-    priv_: *mut GstAudioVisualizerPrivate,
+    pub priv_: *mut GstAudioVisualizerPrivate,
 }
 
 #[repr(C)]
 pub struct GstDiscoverer {
     pub parent: gobject::GObject,
-    priv_: *mut GstDiscovererPrivate,
-    _reserved: [gpointer; 4],
+    pub priv_: *mut GstDiscovererPrivate,
+    pub _reserved: [gpointer; 4],
 }
 
 #[repr(C)]
diff --git a/gstreamer-sys/Cargo.toml b/gstreamer-sys/Cargo.toml
index 0b04e5309..0443d8a5d 100644
--- a/gstreamer-sys/Cargo.toml
+++ b/gstreamer-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [features]
 v1_0_10 = []
diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs
index 9dfabd12c..63ef7be4c 100644
--- a/gstreamer-sys/src/lib.rs
+++ b/gstreamer-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -11,7 +11,7 @@ extern crate gobject_sys as gobject;
 #[allow(unused_imports)]
 use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
     c_short, c_ushort, c_long, c_ulong,
-    c_void, size_t, ssize_t, time_t, FILE};
+    c_void, size_t, ssize_t, intptr_t, uintptr_t, time_t, FILE};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType, Volatile};
@@ -1540,7 +1540,7 @@ pub struct GstAllocationParams {
     pub align: size_t,
     pub prefix: size_t,
     pub padding: size_t,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1548,7 +1548,7 @@ pub struct GstAllocatorClass {
     pub object_class: GstObjectClass,
     pub alloc: Option<unsafe extern "C" fn(*mut GstAllocator, size_t, *mut GstAllocationParams) -> *mut GstMemory>,
     pub free: Option<unsafe extern "C" fn(*mut GstAllocator, *mut GstMemory)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1560,7 +1560,7 @@ pub struct GstAtomicQueue(c_void);
 #[repr(C)]
 pub struct GstBinClass {
     pub parent_class: GstElementClass,
-    pool: *mut glib::GThreadPool,
+    pub pool: *mut glib::GThreadPool,
     pub element_added: Option<unsafe extern "C" fn(*mut GstBin, *mut GstElement)>,
     pub element_removed: Option<unsafe extern "C" fn(*mut GstBin, *mut GstElement)>,
     pub add_element: Option<unsafe extern "C" fn(*mut GstBin, *mut GstElement) -> gboolean>,
@@ -1569,7 +1569,7 @@ pub struct GstBinClass {
     pub do_latency: Option<unsafe extern "C" fn(*mut GstBin) -> gboolean>,
     pub deep_element_added: Option<unsafe extern "C" fn(*mut GstBin, *mut GstBin, *mut GstElement)>,
     pub deep_element_removed: Option<unsafe extern "C" fn(*mut GstBin, *mut GstBin, *mut GstElement)>,
-    _gst_reserved: [gpointer; 2],
+    pub _gst_reserved: [gpointer; 2],
 }
 
 #[repr(C)]
@@ -1595,7 +1595,7 @@ pub struct GstBufferPoolAcquireParams {
     pub start: i64,
     pub stop: i64,
     pub flags: GstBufferPoolAcquireFlags,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1612,7 +1612,7 @@ pub struct GstBufferPoolClass {
     pub free_buffer: Option<unsafe extern "C" fn(*mut GstBufferPool, *mut GstBuffer)>,
     pub flush_start: Option<unsafe extern "C" fn(*mut GstBufferPool)>,
     pub flush_stop: Option<unsafe extern "C" fn(*mut GstBufferPool)>,
-    _gst_reserved: [gpointer; 2],
+    pub _gst_reserved: [gpointer; 2],
 }
 
 #[repr(C)]
@@ -1623,7 +1623,7 @@ pub struct GstBusClass {
     pub parent_class: GstObjectClass,
     pub message: Option<unsafe extern "C" fn(*mut GstBus, *mut GstMessage)>,
     pub sync_message: Option<unsafe extern "C" fn(*mut GstBus, *mut GstMessage)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1645,7 +1645,7 @@ pub struct GstChildProxyInterface {
     pub get_children_count: Option<unsafe extern "C" fn(*mut GstChildProxy) -> c_uint>,
     pub child_added: Option<unsafe extern "C" fn(*mut GstChildProxy, *mut gobject::GObject, *const c_char)>,
     pub child_removed: Option<unsafe extern "C" fn(*mut GstChildProxy, *mut gobject::GObject, *const c_char)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1657,7 +1657,7 @@ pub struct GstClockClass {
     pub wait: Option<unsafe extern "C" fn(*mut GstClock, *mut GstClockEntry, *mut GstClockTimeDiff) -> GstClockReturn>,
     pub wait_async: Option<unsafe extern "C" fn(*mut GstClock, *mut GstClockEntry) -> GstClockReturn>,
     pub unschedule: Option<unsafe extern "C" fn(*mut GstClock, *mut GstClockEntry)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1673,7 +1673,7 @@ pub struct GstClockEntry {
     pub destroy_data: glib::GDestroyNotify,
     pub unscheduled: gboolean,
     pub woken_up: gboolean,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1689,7 +1689,7 @@ pub struct GstControlBindingClass {
     pub get_value: Option<unsafe extern "C" fn(*mut GstControlBinding, GstClockTime) -> *mut gobject::GValue>,
     pub get_value_array: Option<unsafe extern "C" fn(*mut GstControlBinding, GstClockTime, GstClockTime, c_uint, gpointer) -> gboolean>,
     pub get_g_value_array: Option<unsafe extern "C" fn(*mut GstControlBinding, GstClockTime, GstClockTime, c_uint, *mut gobject::GValue) -> gboolean>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1698,7 +1698,7 @@ pub struct GstControlBindingPrivate(c_void);
 #[repr(C)]
 pub struct GstControlSourceClass {
     pub parent_class: GstObjectClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1706,10 +1706,10 @@ pub struct GstDateTime(c_void);
 
 #[repr(C)]
 pub struct GstDebugCategory {
-    threshold: c_int,
-    color: c_uint,
-    name: *const c_char,
-    description: *const c_char,
+    pub threshold: c_int,
+    pub color: c_uint,
+    pub name: *const c_char,
+    pub description: *const c_char,
 }
 
 #[repr(C)]
@@ -1720,13 +1720,13 @@ pub struct GstDeviceClass {
     pub parent_class: GstObjectClass,
     pub create_element: Option<unsafe extern "C" fn(*mut GstDevice, *const c_char) -> *mut GstElement>,
     pub reconfigure_element: Option<unsafe extern "C" fn(*mut GstDevice, *mut GstElement) -> gboolean>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstDeviceMonitorClass {
     pub parent_class: GstObjectClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1742,8 +1742,8 @@ pub struct GstDeviceProviderClass {
     pub probe: Option<unsafe extern "C" fn(*mut GstDeviceProvider) -> *mut glib::GList>,
     pub start: Option<unsafe extern "C" fn(*mut GstDeviceProvider) -> gboolean>,
     pub stop: Option<unsafe extern "C" fn(*mut GstDeviceProvider)>,
-    metadata: gpointer,
-    _gst_reserved: [gpointer; 4],
+    pub metadata: gpointer,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1779,7 +1779,7 @@ pub struct GstElementClass {
     pub query: Option<unsafe extern "C" fn(*mut GstElement, *mut GstQuery) -> gboolean>,
     pub post_message: Option<unsafe extern "C" fn(*mut GstElement, *mut GstMessage) -> gboolean>,
     pub set_context: Option<unsafe extern "C" fn(*mut GstElement, *mut GstContext)>,
-    _gst_reserved: [gpointer; 18],
+    pub _gst_reserved: [gpointer; 18],
 }
 
 #[repr(C)]
@@ -1804,7 +1804,7 @@ pub struct GstFormatDefinition {
 #[repr(C)]
 pub struct GstGhostPadClass {
     pub parent_class: GstProxyPadClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1819,12 +1819,11 @@ pub struct GstIterator {
     pub free: GstIteratorFreeFunction,
     pub pushed: *mut GstIterator,
     pub type_: GType,
-    _truncated_record_marker: c_void,
-    //union,
-    //cookie: guint32,
-    //master_cookie: guint32*,
-    //size: guint,
-    //_gst_reserved: gpointer,
+    pub lock: *mut glib::GMutex,
+    pub cookie: u32,
+    pub master_cookie: *mut u32,
+    pub size: c_uint,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1835,7 +1834,7 @@ pub struct GstMapInfo {
     pub size: size_t,
     pub maxsize: size_t,
     pub user_data: [gpointer; 4],
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1856,9 +1855,8 @@ pub struct GstMessage {
     pub timestamp: u64,
     pub src: *mut GstObject,
     pub seqnum: u32,
-    _truncated_record_marker: c_void,
-    //union,
-    //cond: GCond,
+    pub lock: glib::GMutex,
+    pub cond: glib::GCond,
 }
 
 #[repr(C)]
@@ -1893,8 +1891,8 @@ pub struct GstMiniObject {
     pub copy: GstMiniObjectCopyFunction,
     pub dispose: GstMiniObjectDisposeFunction,
     pub free: GstMiniObjectFreeFunction,
-    n_qdata: c_uint,
-    qdata: gpointer,
+    pub n_qdata: c_uint,
+    pub qdata: gpointer,
 }
 
 #[repr(C)]
@@ -1902,7 +1900,7 @@ pub struct GstObjectClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub path_string_separator: *const c_char,
     pub deep_notify: Option<unsafe extern "C" fn(*mut GstObject, *mut GstObject, *mut gobject::GParamSpec)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1910,7 +1908,7 @@ pub struct GstPadClass {
     pub parent_class: GstObjectClass,
     pub linked: Option<unsafe extern "C" fn(*mut GstPad, *mut GstPad)>,
     pub unlinked: Option<unsafe extern "C" fn(*mut GstPad, *mut GstPad)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1923,15 +1921,14 @@ pub struct GstPadProbeInfo {
     pub data: gpointer,
     pub offset: u64,
     pub size: c_uint,
-    _truncated_record_marker: c_void,
-    //union,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstPadTemplateClass {
     pub parent_class: GstObjectClass,
     pub pad_created: Option<unsafe extern "C" fn(*mut GstPadTemplate, *mut GstPad)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1963,7 +1960,7 @@ pub struct GstParseContext(c_void);
 #[repr(C)]
 pub struct GstPipelineClass {
     pub parent_class: GstBinClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1985,7 +1982,7 @@ pub struct GstPluginDesc {
     pub package: *const c_char,
     pub origin: *const c_char,
     pub release_datetime: *const c_char,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1997,7 +1994,7 @@ pub struct GstPoll(c_void);
 #[repr(C)]
 pub struct GstPollFD {
     pub fd: c_int,
-    idx: c_int,
+    pub idx: c_int,
 }
 
 #[repr(C)]
@@ -2011,7 +2008,7 @@ pub struct GstPresetInterface {
     pub delete_preset: Option<unsafe extern "C" fn(*mut GstPreset, *const c_char) -> gboolean>,
     pub set_meta: Option<unsafe extern "C" fn(*mut GstPreset, *const c_char, *const c_char, *mut *mut c_char) -> gboolean>,
     pub get_meta: Option<unsafe extern "C" fn(*mut GstPreset, *const c_char, *const c_char, *mut *mut c_char) -> gboolean>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2023,7 +2020,7 @@ pub struct GstProtectionMeta {
 #[repr(C)]
 pub struct GstProxyPadClass {
     pub parent_class: GstPadClass,
-    _gst_reserved: [gpointer; 1],
+    pub _gst_reserved: [gpointer; 1],
 }
 
 #[repr(C)]
@@ -2059,14 +2056,14 @@ pub struct GstSegment {
     pub time: u64,
     pub position: u64,
     pub duration: u64,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstStaticCaps {
     pub caps: *mut GstCaps,
     pub string: *const c_char,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2080,14 +2077,14 @@ pub struct GstStaticPadTemplate {
 #[repr(C)]
 pub struct GstStreamClass {
     pub parent_class: GstObjectClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstStreamCollectionClass {
     pub parent_class: GstObjectClass,
     pub stream_notify: Option<unsafe extern "C" fn(*mut GstStreamCollection, *mut GstStream, *mut gobject::GParamSpec)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2099,13 +2096,13 @@ pub struct GstStreamPrivate(c_void);
 #[repr(C)]
 pub struct GstStructure {
     pub type_: GType,
-    name: glib::GQuark,
+    pub name: glib::GQuark,
 }
 
 #[repr(C)]
 pub struct GstSystemClockClass {
     pub parent_class: GstClockClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2124,8 +2121,8 @@ pub struct GstTagSetterInterface {
 #[repr(C)]
 pub struct GstTaskClass {
     pub parent_class: GstObjectClass,
-    pool: *mut GstTaskPool,
-    _gst_reserved: [gpointer; 4],
+    pub pool: *mut GstTaskPool,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2135,7 +2132,7 @@ pub struct GstTaskPoolClass {
     pub cleanup: Option<unsafe extern "C" fn(*mut GstTaskPool)>,
     pub push: Option<unsafe extern "C" fn(*mut GstTaskPool, GstTaskPoolFunction, gpointer, *mut *mut glib::GError) -> gpointer>,
     pub join: Option<unsafe extern "C" fn(*mut GstTaskPool, gpointer)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2161,7 +2158,7 @@ pub struct GstTocSetterInterface {
 #[repr(C)]
 pub struct GstTracerClass {
     pub parent_class: GstObjectClass,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2179,7 +2176,7 @@ pub struct GstTypeFind {
     pub suggest: Option<unsafe extern "C" fn(gpointer, c_uint, *mut GstCaps)>,
     pub data: gpointer,
     pub get_length: Option<unsafe extern "C" fn(gpointer) -> u64>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2203,7 +2200,7 @@ pub struct GstValueTable {
     pub compare: GstValueCompareFunc,
     pub serialize: GstValueSerializeFunc,
     pub deserialize: GstValueDeserializeFunc,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 // Classes
@@ -2218,8 +2215,8 @@ pub struct GstAllocator {
     pub mem_is_span: GstMemoryIsSpanFunction,
     pub mem_map_full: GstMemoryMapFullFunction,
     pub mem_unmap_full: GstMemoryUnmapFullFunction,
-    _gst_reserved: [gpointer; 2],
-    priv_: *mut GstAllocatorPrivate,
+    pub _gst_reserved: [gpointer; 2],
+    pub priv_: *mut GstAllocatorPrivate,
 }
 
 #[repr(C)]
@@ -2235,8 +2232,8 @@ pub struct GstBin {
     pub clock_dirty: gboolean,
     pub provided_clock: *mut GstClock,
     pub clock_provider: *mut GstElement,
-    priv_: *mut GstBinPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstBinPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2246,22 +2243,22 @@ pub struct GstBitmask(c_void);
 pub struct GstBufferPool {
     pub object: GstObject,
     pub flushing: c_int,
-    priv_: *mut GstBufferPoolPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstBufferPoolPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstBus {
     pub object: GstObject,
-    priv_: *mut GstBusPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstBusPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstClock {
     pub object: GstObject,
-    priv_: *mut GstClockPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstClockPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2269,10 +2266,9 @@ pub struct GstControlBinding {
     pub parent: GstObject,
     pub name: *mut c_char,
     pub pspec: *mut gobject::GParamSpec,
-    object: *mut GstObject,
-    disabled: gboolean,
-    _truncated_record_marker: c_void,
-    //union,
+    pub object: *mut GstObject,
+    pub disabled: gboolean,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2280,29 +2276,29 @@ pub struct GstControlSource {
     pub parent: GstObject,
     pub get_value: GstControlSourceGetValue,
     pub get_value_array: GstControlSourceGetValueArray,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstDevice {
     pub parent: GstObject,
-    priv_: *mut GstDevicePrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstDevicePrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstDeviceMonitor {
     pub parent: GstObject,
-    priv_: *mut GstDeviceMonitorPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstDeviceMonitorPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstDeviceProvider {
     pub parent: GstObject,
     pub devices: *mut glib::GList,
-    priv_: *mut GstDeviceProviderPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstDeviceProviderPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2337,7 +2333,7 @@ pub struct GstElement {
     pub sinkpads: *mut glib::GList,
     pub pads_cookie: u32,
     pub contexts: *mut glib::GList,
-    _gst_reserved: [gpointer; 3],
+    pub _gst_reserved: [gpointer; 3],
 }
 
 #[repr(C)]
@@ -2355,7 +2351,7 @@ pub struct GstFractionRange(c_void);
 #[repr(C)]
 pub struct GstGhostPad {
     pub pad: GstProxyPad,
-    priv_: *mut GstGhostPadPrivate,
+    pub priv_: *mut GstGhostPadPrivate,
 }
 
 #[repr(C)]
@@ -2367,15 +2363,14 @@ pub struct GstIntRange(c_void);
 #[repr(C)]
 pub struct GstObject {
     pub object: gobject::GInitiallyUnowned,
-    _truncated_record_marker: c_void,
-    //union,
-    //name: gchar*,
-    //parent: GstObject*,
-    //flags: guint32,
-    //control_bindings: GList*,
-    //control_rate: guint64,
-    //last_sync: guint64,
-    //_gst_reserved: gpointer,
+    pub lock: glib::GMutex,
+    pub name: *mut c_char,
+    pub parent: *mut GstObject,
+    pub flags: u32,
+    pub control_bindings: *mut glib::GList,
+    pub control_rate: u64,
+    pub last_sync: u64,
+    pub _gst_reserved: gpointer,
 }
 
 #[repr(C)]
@@ -2384,48 +2379,47 @@ pub struct GstPad {
     pub element_private: gpointer,
     pub padtemplate: *mut GstPadTemplate,
     pub direction: GstPadDirection,
-    stream_rec_lock: glib::GRecMutex,
-    task: *mut GstTask,
-    block_cond: glib::GCond,
-    probes: glib::GHookList,
-    mode: GstPadMode,
-    activatefunc: GstPadActivateFunction,
-    activatedata: gpointer,
-    activatenotify: glib::GDestroyNotify,
-    activatemodefunc: GstPadActivateModeFunction,
-    activatemodedata: gpointer,
-    activatemodenotify: glib::GDestroyNotify,
-    peer: *mut GstPad,
-    linkfunc: GstPadLinkFunction,
-    linkdata: gpointer,
-    linknotify: glib::GDestroyNotify,
-    unlinkfunc: GstPadUnlinkFunction,
-    unlinkdata: gpointer,
-    unlinknotify: glib::GDestroyNotify,
-    chainfunc: GstPadChainFunction,
-    chaindata: gpointer,
-    chainnotify: glib::GDestroyNotify,
-    chainlistfunc: GstPadChainListFunction,
-    chainlistdata: gpointer,
-    chainlistnotify: glib::GDestroyNotify,
-    getrangefunc: GstPadGetRangeFunction,
-    getrangedata: gpointer,
-    getrangenotify: glib::GDestroyNotify,
-    eventfunc: GstPadEventFunction,
-    eventdata: gpointer,
-    eventnotify: glib::GDestroyNotify,
-    offset: i64,
-    queryfunc: GstPadQueryFunction,
-    querydata: gpointer,
-    querynotify: glib::GDestroyNotify,
-    iterintlinkfunc: GstPadIterIntLinkFunction,
-    iterintlinkdata: gpointer,
-    iterintlinknotify: glib::GDestroyNotify,
-    num_probes: c_int,
-    num_blocked: c_int,
-    priv_: *mut GstPadPrivate,
-    _truncated_record_marker: c_void,
-    //union,
+    pub stream_rec_lock: glib::GRecMutex,
+    pub task: *mut GstTask,
+    pub block_cond: glib::GCond,
+    pub probes: glib::GHookList,
+    pub mode: GstPadMode,
+    pub activatefunc: GstPadActivateFunction,
+    pub activatedata: gpointer,
+    pub activatenotify: glib::GDestroyNotify,
+    pub activatemodefunc: GstPadActivateModeFunction,
+    pub activatemodedata: gpointer,
+    pub activatemodenotify: glib::GDestroyNotify,
+    pub peer: *mut GstPad,
+    pub linkfunc: GstPadLinkFunction,
+    pub linkdata: gpointer,
+    pub linknotify: glib::GDestroyNotify,
+    pub unlinkfunc: GstPadUnlinkFunction,
+    pub unlinkdata: gpointer,
+    pub unlinknotify: glib::GDestroyNotify,
+    pub chainfunc: GstPadChainFunction,
+    pub chaindata: gpointer,
+    pub chainnotify: glib::GDestroyNotify,
+    pub chainlistfunc: GstPadChainListFunction,
+    pub chainlistdata: gpointer,
+    pub chainlistnotify: glib::GDestroyNotify,
+    pub getrangefunc: GstPadGetRangeFunction,
+    pub getrangedata: gpointer,
+    pub getrangenotify: glib::GDestroyNotify,
+    pub eventfunc: GstPadEventFunction,
+    pub eventdata: gpointer,
+    pub eventnotify: glib::GDestroyNotify,
+    pub offset: i64,
+    pub queryfunc: GstPadQueryFunction,
+    pub querydata: gpointer,
+    pub querynotify: glib::GDestroyNotify,
+    pub iterintlinkfunc: GstPadIterIntLinkFunction,
+    pub iterintlinkdata: gpointer,
+    pub iterintlinknotify: glib::GDestroyNotify,
+    pub num_probes: c_int,
+    pub num_blocked: c_int,
+    pub priv_: *mut GstPadPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2435,7 +2429,7 @@ pub struct GstPadTemplate {
     pub direction: GstPadDirection,
     pub presence: GstPadPresence,
     pub caps: *mut GstCaps,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2450,8 +2444,8 @@ pub struct GstPipeline {
     pub fixed_clock: *mut GstClock,
     pub stream_time: GstClockTime,
     pub delay: GstClockTime,
-    priv_: *mut GstPipelinePrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstPipelinePrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2463,36 +2457,36 @@ pub struct GstPluginFeature(c_void);
 #[repr(C)]
 pub struct GstProxyPad {
     pub pad: GstPad,
-    priv_: *mut GstProxyPadPrivate,
+    pub priv_: *mut GstProxyPadPrivate,
 }
 
 #[repr(C)]
 pub struct GstRegistry {
     pub object: GstObject,
-    priv_: *mut GstRegistryPrivate,
+    pub priv_: *mut GstRegistryPrivate,
 }
 
 #[repr(C)]
 pub struct GstStream {
     pub object: GstObject,
     pub stream_id: *const c_char,
-    priv_: *mut GstStreamPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstStreamPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstStreamCollection {
     pub object: GstObject,
-    upstream_id: *mut c_char,
-    priv_: *mut GstStreamCollectionPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub upstream_id: *mut c_char,
+    pub priv_: *mut GstStreamCollectionPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstSystemClock {
     pub clock: GstClock,
-    priv_: *mut GstSystemClockPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstSystemClockPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -2505,23 +2499,23 @@ pub struct GstTask {
     pub user_data: gpointer,
     pub notify: glib::GDestroyNotify,
     pub running: gboolean,
-    thread: *mut glib::GThread,
-    priv_: *mut GstTaskPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub thread: *mut glib::GThread,
+    pub priv_: *mut GstTaskPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstTaskPool {
     pub object: GstObject,
-    pool: *mut glib::GThreadPool,
-    _gst_reserved: [gpointer; 4],
+    pub pool: *mut glib::GThreadPool,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstTracer {
     pub parent: GstObject,
-    priv_: *mut GstTracerPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstTracerPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
diff --git a/gstreamer-tag-sys/Cargo.toml b/gstreamer-tag-sys/Cargo.toml
index 94a5ab184..3798abcee 100644
--- a/gstreamer-tag-sys/Cargo.toml
+++ b/gstreamer-tag-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
diff --git a/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag-sys/src/lib.rs
index 1e55b686a..6f73a6d46 100644
--- a/gstreamer-tag-sys/src/lib.rs
+++ b/gstreamer-tag-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -13,7 +13,7 @@ extern crate gstreamer_base_sys as gst_base;
 #[allow(unused_imports)]
 use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
     c_short, c_ushort, c_long, c_ulong,
-    c_void, size_t, ssize_t, time_t, FILE};
+    c_void, size_t, ssize_t, intptr_t, uintptr_t, time_t, FILE};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType, Volatile};
@@ -142,7 +142,7 @@ pub struct GstTagDemuxClass {
     pub identify_tag: Option<unsafe extern "C" fn(*mut GstTagDemux, *mut gst::GstBuffer, gboolean, *mut c_uint) -> gboolean>,
     pub parse_tag: Option<unsafe extern "C" fn(*mut GstTagDemux, *mut gst::GstBuffer, gboolean, *mut c_uint, *mut *mut gst::GstTagList) -> GstTagDemuxResult>,
     pub merge_tags: Option<unsafe extern "C" fn(*mut GstTagDemux, *const gst::GstTagList, *const gst::GstTagList) -> *mut gst::GstTagList>,
-    reserved: [gpointer; 4],
+    pub reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -153,7 +153,7 @@ pub struct GstTagMuxClass {
     pub parent_class: gst::GstElementClass,
     pub render_start_tag: Option<unsafe extern "C" fn(*mut GstTagMux, *const gst::GstTagList) -> *mut gst::GstBuffer>,
     pub render_end_tag: Option<unsafe extern "C" fn(*mut GstTagMux, *const gst::GstTagList) -> *mut gst::GstBuffer>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -168,15 +168,15 @@ pub struct GstTagXmpWriterInterface {
 #[repr(C)]
 pub struct GstTagDemux {
     pub element: gst::GstElement,
-    priv_: *mut GstTagDemuxPrivate,
-    reserved: [gpointer; 4],
+    pub priv_: *mut GstTagDemuxPrivate,
+    pub reserved: [gpointer; 4],
 }
 
 #[repr(C)]
 pub struct GstTagMux {
     pub element: gst::GstElement,
-    priv_: *mut GstTagMuxPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstTagMuxPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 // Interfaces
diff --git a/gstreamer-video-sys/Cargo.toml b/gstreamer-video-sys/Cargo.toml
index 6eefe8c5f..e720a5eb8 100644
--- a/gstreamer-video-sys/Cargo.toml
+++ b/gstreamer-video-sys/Cargo.toml
@@ -3,9 +3,9 @@ pkg-config = "0.3.7"
 
 [dependencies]
 bitflags = "0.8"
-glib-sys = "0.3"
-gobject-sys = "0.3"
 libc = "0.2"
+glib-sys = { git = "https://github.com/gtk-rs/sys.git" }
+gobject-sys = { git = "https://github.com/gtk-rs/sys.git" }
 
 [dependencies.gstreamer-sys]
 path = "../gstreamer-sys"
diff --git a/gstreamer-video-sys/src/lib.rs b/gstreamer-video-sys/src/lib.rs
index 6a2834727..e0c14cd6c 100644
--- a/gstreamer-video-sys/src/lib.rs
+++ b/gstreamer-video-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (10e1d4f+) from gir-files (???)
+// This file was generated by gir (bf7bd49) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -843,7 +843,7 @@ pub type GstVideoGLTextureUpload = Option<unsafe extern "C" fn(*mut GstVideoGLTe
 pub struct GstColorBalanceChannelClass {
     pub parent: gobject::GObjectClass,
     pub value_changed: Option<unsafe extern "C" fn(*mut GstColorBalanceChannel, c_int)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -854,7 +854,7 @@ pub struct GstColorBalanceInterface {
     pub get_value: Option<unsafe extern "C" fn(*mut GstColorBalance, *mut GstColorBalanceChannel) -> c_int>,
     pub get_balance_type: Option<unsafe extern "C" fn(*mut GstColorBalance) -> GstColorBalanceType>,
     pub value_changed: Option<unsafe extern "C" fn(*mut GstColorBalance, *mut GstColorBalanceChannel, c_int)>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -891,8 +891,8 @@ pub struct GstVideoChromaResample(c_void);
 
 #[repr(C)]
 pub struct GstVideoCodecFrame {
-    ref_count: c_int,
-    flags: u32,
+    pub ref_count: c_int,
+    pub flags: u32,
     pub system_frame_number: u32,
     pub decode_frame_number: u32,
     pub presentation_frame_number: u32,
@@ -903,21 +903,21 @@ pub struct GstVideoCodecFrame {
     pub input_buffer: *mut gst::GstBuffer,
     pub output_buffer: *mut gst::GstBuffer,
     pub deadline: gst::GstClockTime,
-    events: *mut glib::GList,
-    user_data: gpointer,
-    user_data_destroy_notify: glib::GDestroyNotify,
+    pub events: *mut glib::GList,
+    pub user_data: gpointer,
+    pub user_data_destroy_notify: glib::GDestroyNotify,
     _truncated_record_marker: c_void,
     //union,
 }
 
 #[repr(C)]
 pub struct GstVideoCodecState {
-    ref_count: c_int,
+    pub ref_count: c_int,
     pub info: GstVideoInfo,
     pub caps: *mut gst::GstCaps,
     pub codec_data: *mut gst::GstBuffer,
     pub allocation_caps: *mut gst::GstCaps,
-    padding: [c_void; 19],
+    pub padding: [c_void; 19],
 }
 
 #[repr(C)]
@@ -955,7 +955,7 @@ pub struct GstVideoCropMeta {
 
 #[repr(C)]
 pub struct GstVideoDecoderClass {
-    element_class: gst::GstElementClass,
+    pub element_class: gst::GstElementClass,
     pub open: Option<unsafe extern "C" fn(*mut GstVideoDecoder) -> gboolean>,
     pub close: Option<unsafe extern "C" fn(*mut GstVideoDecoder) -> gboolean>,
     pub start: Option<unsafe extern "C" fn(*mut GstVideoDecoder) -> gboolean>,
@@ -976,7 +976,7 @@ pub struct GstVideoDecoderClass {
     pub getcaps: Option<unsafe extern "C" fn(*mut GstVideoDecoder, *mut gst::GstCaps) -> *mut gst::GstCaps>,
     pub drain: Option<unsafe extern "C" fn(*mut GstVideoDecoder) -> gst::GstFlowReturn>,
     pub transform_meta: Option<unsafe extern "C" fn(*mut GstVideoDecoder, *mut GstVideoCodecFrame, *mut gst::GstMeta) -> gboolean>,
-    padding: [c_void; 14],
+    pub padding: [c_void; 14],
 }
 
 #[repr(C)]
@@ -992,7 +992,7 @@ pub struct GstVideoDither(c_void);
 
 #[repr(C)]
 pub struct GstVideoEncoderClass {
-    element_class: gst::GstElementClass,
+    pub element_class: gst::GstElementClass,
     pub open: Option<unsafe extern "C" fn(*mut GstVideoEncoder) -> gboolean>,
     pub close: Option<unsafe extern "C" fn(*mut GstVideoEncoder) -> gboolean>,
     pub start: Option<unsafe extern "C" fn(*mut GstVideoEncoder) -> gboolean>,
@@ -1012,7 +1012,7 @@ pub struct GstVideoEncoderClass {
     pub sink_query: Option<unsafe extern "C" fn(*mut GstVideoEncoder, *mut gst::GstQuery) -> gboolean>,
     pub src_query: Option<unsafe extern "C" fn(*mut GstVideoEncoder, *mut gst::GstQuery) -> gboolean>,
     pub transform_meta: Option<unsafe extern "C" fn(*mut GstVideoEncoder, *mut GstVideoCodecFrame, *mut gst::GstMeta) -> gboolean>,
-    _gst_reserved: [gpointer; 16],
+    pub _gst_reserved: [gpointer; 16],
 }
 
 #[repr(C)]
@@ -1024,7 +1024,7 @@ pub struct GstVideoFilterClass {
     pub set_info: Option<unsafe extern "C" fn(*mut GstVideoFilter, *mut gst::GstCaps, *mut GstVideoInfo, *mut gst::GstCaps, *mut GstVideoInfo) -> gboolean>,
     pub transform_frame: Option<unsafe extern "C" fn(*mut GstVideoFilter, *mut GstVideoFrame, *mut GstVideoFrame) -> gst::GstFlowReturn>,
     pub transform_frame_ip: Option<unsafe extern "C" fn(*mut GstVideoFilter, *mut GstVideoFrame) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1050,7 +1050,7 @@ pub struct GstVideoFormatInfo {
     pub tile_mode: GstVideoTileMode,
     pub tile_ws: c_uint,
     pub tile_hs: c_uint,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1062,7 +1062,7 @@ pub struct GstVideoFrame {
     pub id: c_int,
     pub data: [gpointer; 4],
     pub map: [gst::GstMapInfo; 4],
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1071,11 +1071,11 @@ pub struct GstVideoGLTextureUploadMeta {
     pub texture_orientation: GstVideoGLTextureOrientation,
     pub n_textures: c_uint,
     pub texture_type: [GstVideoGLTextureType; 4],
-    buffer: *mut gst::GstBuffer,
-    upload: GstVideoGLTextureUpload,
-    user_data: gpointer,
-    user_data_copy: gobject::GBoxedCopyFunc,
-    user_data_free: gobject::GBoxedFreeFunc,
+    pub buffer: *mut gst::GstBuffer,
+    pub upload: GstVideoGLTextureUpload,
+    pub user_data: gpointer,
+    pub user_data_copy: gobject::GBoxedCopyFunc,
+    pub user_data_free: gobject::GBoxedFreeFunc,
 }
 
 #[repr(C)]
@@ -1095,8 +1095,7 @@ pub struct GstVideoInfo {
     pub fps_d: c_int,
     pub offset: [size_t; 4],
     pub stride: [c_int; 4],
-    _truncated_record_marker: c_void,
-    //union,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1185,7 +1184,7 @@ pub struct GstVideoResampler {
     pub phase: *mut u32,
     pub n_taps: *mut u32,
     pub taps: *mut c_double,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1195,7 +1194,7 @@ pub struct GstVideoScaler(c_void);
 pub struct GstVideoSinkClass {
     pub parent_class: gst_base::GstBaseSinkClass,
     pub show_frame: Option<unsafe extern "C" fn(*mut GstVideoSink, *mut gst::GstBuffer) -> gst::GstFlowReturn>,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1240,7 +1239,7 @@ pub struct GstColorBalanceChannel {
     pub label: *mut c_char,
     pub min_value: c_int,
     pub max_value: c_int,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1251,26 +1250,26 @@ pub struct GstVideoBufferPool {
 
 #[repr(C)]
 pub struct GstVideoDecoder {
-    element: gst::GstElement,
-    sinkpad: *mut gst::GstPad,
-    srcpad: *mut gst::GstPad,
-    stream_lock: glib::GRecMutex,
-    input_segment: gst::GstSegment,
-    output_segment: gst::GstSegment,
-    priv_: *mut GstVideoDecoderPrivate,
-    padding: [c_void; 20],
+    pub element: gst::GstElement,
+    pub sinkpad: *mut gst::GstPad,
+    pub srcpad: *mut gst::GstPad,
+    pub stream_lock: glib::GRecMutex,
+    pub input_segment: gst::GstSegment,
+    pub output_segment: gst::GstSegment,
+    pub priv_: *mut GstVideoDecoderPrivate,
+    pub padding: [c_void; 20],
 }
 
 #[repr(C)]
 pub struct GstVideoEncoder {
-    element: gst::GstElement,
-    sinkpad: *mut gst::GstPad,
-    srcpad: *mut gst::GstPad,
-    stream_lock: glib::GRecMutex,
-    input_segment: gst::GstSegment,
-    output_segment: gst::GstSegment,
-    priv_: *mut GstVideoEncoderPrivate,
-    padding: [c_void; 20],
+    pub element: gst::GstElement,
+    pub sinkpad: *mut gst::GstPad,
+    pub srcpad: *mut gst::GstPad,
+    pub stream_lock: glib::GRecMutex,
+    pub input_segment: gst::GstSegment,
+    pub output_segment: gst::GstSegment,
+    pub priv_: *mut GstVideoEncoderPrivate,
+    pub padding: [c_void; 20],
 }
 
 #[repr(C)]
@@ -1279,7 +1278,7 @@ pub struct GstVideoFilter {
     pub negotiated: gboolean,
     pub in_info: GstVideoInfo,
     pub out_info: GstVideoInfo,
-    _gst_reserved: [gpointer; 4],
+    pub _gst_reserved: [gpointer; 4],
 }
 
 #[repr(C)]
@@ -1290,8 +1289,8 @@ pub struct GstVideoSink {
     pub element: gst_base::GstBaseSink,
     pub width: c_int,
     pub height: c_int,
-    priv_: *mut GstVideoSinkPrivate,
-    _gst_reserved: [gpointer; 4],
+    pub priv_: *mut GstVideoSinkPrivate,
+    pub _gst_reserved: [gpointer; 4],
 }
 
 // Interfaces