refresh gir code generator up to the version in submodule

The version of gir code generator does not synchronize to the version
in submodule.

This commit generates hinawa-sys/hinawa crates with the refreshed
gir code generator.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

17 files changed, 382 insertions, 28 deletions

diff --git a/hinawa-sys/Cargo.toml b/hinawa-sys/Cargo.toml
index 277b7da..b4b8275 100644
--- a/hinawa-sys/Cargo.toml
+++ b/hinawa-sys/Cargo.toml
@@ -7,21 +7,25 @@ links = "hinawa"
 build = "build.rs"
 license = "MIT"
 repository = "https://github.com/alsa-project/hinawa-rs/"
-
 [package.metadata.docs.rs]
 features = ["dox"]
+[package.metadata.system-deps.hinawa]
+name = "hinawa"
+version = "2.0"
+
+[package.metadata.system-deps.hinawa.feature-versions]
 
 [lib]
 name = "hinawa_sys"
 
 [dependencies]
 libc = "0.2"
-
 glib-sys = "0.10"
 gobject-sys = "0.10"
 
 [build-dependencies]
 pkg-config = "0.3.7"
+system-deps = "1.3"
 
 [dev-dependencies]
 shell-words = "0.1.0"
diff --git a/hinawa-sys/tests/abi.rs b/hinawa-sys/tests/abi.rs
new file mode 100644
index 0000000..cfd0764
--- /dev/null
+++ b/hinawa-sys/tests/abi.rs
@@ -0,0 +1,306 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
+extern crate hinawa_sys;
+extern crate shell_words;
+extern crate tempfile;
+use std::env;
+use std::error::Error;
+use std::path::Path;
+use std::mem::{align_of, size_of};
+use std::process::Command;
+use std::str;
+use tempfile::Builder;
+use hinawa_sys::*;
+
+static PACKAGES: &[&str] = &["hinawa"];
+
+#[derive(Clone, Debug)]
+struct Compiler {
+    pub args: Vec<String>,
+}
+
+impl Compiler {
+    pub fn new() -> Result<Compiler, Box<dyn Error>> {
+        let mut args = get_var("CC", "cc")?;
+        args.push("-Wno-deprecated-declarations".to_owned());
+        // For %z support in printf when using MinGW.
+        args.push("-D__USE_MINGW_ANSI_STDIO".to_owned());
+        args.extend(get_var("CFLAGS", "")?);
+        args.extend(get_var("CPPFLAGS", "")?);
+        args.extend(pkg_config_cflags(PACKAGES)?);
+        Ok(Compiler { args })
+    }
+
+    pub fn define<'a, V: Into<Option<&'a str>>>(&mut self, var: &str, val: V) {
+        let arg = match val.into() {
+            None => format!("-D{}", var),
+            Some(val) => format!("-D{}={}", var, val),
+        };
+        self.args.push(arg);
+    }
+
+    pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box<dyn Error>> {
+        let mut cmd = self.to_command();
+        cmd.arg(src);
+        cmd.arg("-o");
+        cmd.arg(out);
+        let status = cmd.spawn()?.wait()?;
+        if !status.success() {
+            return Err(format!("compilation command {:?} failed, {}",
+                               &cmd, status).into());
+        }
+        Ok(())
+    }
+
+    fn to_command(&self) -> Command {
+        let mut cmd = Command::new(&self.args[0]);
+        cmd.args(&self.args[1..]);
+        cmd
+    }
+}
+
+fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {
+    match env::var(name) {
+        Ok(value) => Ok(shell_words::split(&value)?),
+        Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),
+        Err(err) => Err(format!("{} {}", name, err).into()),
+    }
+}
+
+fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
+    if packages.is_empty() {
+        return Ok(Vec::new());
+    }
+    let mut cmd = Command::new("pkg-config");
+    cmd.arg("--cflags");
+    cmd.args(packages);
+    let out = cmd.output()?;
+    if !out.status.success() {
+        return Err(format!("command {:?} returned {}",
+                           &cmd, out.status).into());
+    }
+    let stdout = str::from_utf8(&out.stdout)?;
+    Ok(shell_words::split(stdout.trim())?)
+}
+
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+struct Layout {
+    size: usize,
+    alignment: usize,
+}
+
+#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
+struct Results {
+    /// Number of successfully completed tests.
+    passed: usize,
+    /// Total number of failed tests (including those that failed to compile).
+    failed: usize,
+    /// Number of tests that failed to compile.
+    failed_to_compile: usize,
+}
+
+impl Results {
+    fn record_passed(&mut self) {
+        self.passed += 1;
+    }
+    fn record_failed(&mut self) {
+        self.failed += 1;
+    }
+    fn record_failed_to_compile(&mut self) {
+        self.failed += 1;
+        self.failed_to_compile += 1;
+    }
+    fn summary(&self) -> String {
+        format!(
+            "{} passed; {} failed (compilation errors: {})",
+            self.passed,
+            self.failed,
+            self.failed_to_compile)
+    }
+    fn expect_total_success(&self) {
+        if self.failed == 0 {
+            println!("OK: {}", self.summary());
+        } else {
+            panic!("FAILED: {}", self.summary());
+        };
+    }
+}
+
+#[test]
+fn cross_validate_constants_with_c() {
+    let tmpdir = Builder::new().prefix("abi").tempdir().expect("temporary directory");
+    let cc = Compiler::new().expect("configured compiler");
+
+    assert_eq!("1",
+               get_c_value(tmpdir.path(), &cc, "1").expect("C constant"),
+               "failed to obtain correct constant value for 1");
+
+    let mut results : Results = Default::default();
+    for (i, &(name, rust_value)) in RUST_CONSTANTS.iter().enumerate() {
+        match get_c_value(tmpdir.path(), &cc, name) {
+            Err(e) => {
+                results.record_failed_to_compile();
+                eprintln!("{}", e);
+            },
+            Ok(ref c_value) => {
+                if rust_value == c_value {
+                    results.record_passed();
+                } else {
+                    results.record_failed();
+                    eprintln!("Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
+                              name, rust_value, c_value);
+                }
+            }
+        };
+        if (i + 1) % 25 == 0 {
+            println!("constants ... {}", results.summary());
+        }
+    }
+    results.expect_total_success();
+}
+
+#[test]
+fn cross_validate_layout_with_c() {
+    let tmpdir = Builder::new().prefix("abi").tempdir().expect("temporary directory");
+    let cc = Compiler::new().expect("configured compiler");
+
+    assert_eq!(Layout {size: 1, alignment: 1},
+               get_c_layout(tmpdir.path(), &cc, "char").expect("C layout"),
+               "failed to obtain correct layout for char type");
+
+    let mut results : Results = Default::default();
+    for (i, &(name, rust_layout)) in RUST_LAYOUTS.iter().enumerate() {
+        match get_c_layout(tmpdir.path(), &cc, name) {
+            Err(e) => {
+                results.record_failed_to_compile();
+                eprintln!("{}", e);
+            },
+            Ok(c_layout) => {
+                if rust_layout == c_layout {
+                    results.record_passed();
+                } else {
+                    results.record_failed();
+                    eprintln!("Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
+                              name, rust_layout, &c_layout);
+                }
+            }
+        };
+        if (i + 1) % 25 == 0 {
+            println!("layout    ... {}", results.summary());
+        }
+    }
+    results.expect_total_success();
+}
+
+fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result<Layout, Box<dyn Error>> {
+    let exe = dir.join("layout");
+    let mut cc = cc.clone();
+    cc.define("ABI_TYPE_NAME", name);
+    cc.compile(Path::new("tests/layout.c"), &exe)?;
+
+    let mut abi_cmd = Command::new(exe);
+    let output = abi_cmd.output()?;
+    if !output.status.success() {
+        return Err(format!("command {:?} failed, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    let stdout = str::from_utf8(&output.stdout)?;
+    let mut words = stdout.trim().split_whitespace();
+    let size = words.next().unwrap().parse().unwrap();
+    let alignment = words.next().unwrap().parse().unwrap();
+    Ok(Layout {size, alignment})
+}
+
+fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<dyn Error>> {
+    let exe = dir.join("constant");
+    let mut cc = cc.clone();
+    cc.define("ABI_CONSTANT_NAME", name);
+    cc.compile(Path::new("tests/constant.c"), &exe)?;
+
+    let mut abi_cmd = Command::new(exe);
+    let output = abi_cmd.output()?;
+    if !output.status.success() {
+        return Err(format!("command {:?} failed, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    let output = str::from_utf8(&output.stdout)?.trim();
+    if !output.starts_with("###gir test###") ||
+       !output.ends_with("###gir test###") {
+        return Err(format!("command {:?} return invalid output, {:?}",
+                           &abi_cmd, &output).into());
+    }
+
+    Ok(String::from(&output[14..(output.len() - 14)]))
+}
+
+const RUST_LAYOUTS: &[(&str, Layout)] = &[
+    ("HinawaFwFcp", Layout {size: size_of::<HinawaFwFcp>(), alignment: align_of::<HinawaFwFcp>()}),
+    ("HinawaFwFcpClass", Layout {size: size_of::<HinawaFwFcpClass>(), alignment: align_of::<HinawaFwFcpClass>()}),
+    ("HinawaFwNode", Layout {size: size_of::<HinawaFwNode>(), alignment: align_of::<HinawaFwNode>()}),
+    ("HinawaFwNodeClass", Layout {size: size_of::<HinawaFwNodeClass>(), alignment: align_of::<HinawaFwNodeClass>()}),
+    ("HinawaFwRcode", Layout {size: size_of::<HinawaFwRcode>(), alignment: align_of::<HinawaFwRcode>()}),
+    ("HinawaFwReq", Layout {size: size_of::<HinawaFwReq>(), alignment: align_of::<HinawaFwReq>()}),
+    ("HinawaFwReqClass", Layout {size: size_of::<HinawaFwReqClass>(), alignment: align_of::<HinawaFwReqClass>()}),
+    ("HinawaFwResp", Layout {size: size_of::<HinawaFwResp>(), alignment: align_of::<HinawaFwResp>()}),
+    ("HinawaFwRespClass", Layout {size: size_of::<HinawaFwRespClass>(), alignment: align_of::<HinawaFwRespClass>()}),
+    ("HinawaFwTcode", Layout {size: size_of::<HinawaFwTcode>(), alignment: align_of::<HinawaFwTcode>()}),
+    ("HinawaSndDg00x", Layout {size: size_of::<HinawaSndDg00x>(), alignment: align_of::<HinawaSndDg00x>()}),
+    ("HinawaSndDg00xClass", Layout {size: size_of::<HinawaSndDg00xClass>(), alignment: align_of::<HinawaSndDg00xClass>()}),
+    ("HinawaSndDice", Layout {size: size_of::<HinawaSndDice>(), alignment: align_of::<HinawaSndDice>()}),
+    ("HinawaSndDiceClass", Layout {size: size_of::<HinawaSndDiceClass>(), alignment: align_of::<HinawaSndDiceClass>()}),
+    ("HinawaSndEfw", Layout {size: size_of::<HinawaSndEfw>(), alignment: align_of::<HinawaSndEfw>()}),
+    ("HinawaSndEfwClass", Layout {size: size_of::<HinawaSndEfwClass>(), alignment: align_of::<HinawaSndEfwClass>()}),
+    ("HinawaSndMotu", Layout {size: size_of::<HinawaSndMotu>(), alignment: align_of::<HinawaSndMotu>()}),
+    ("HinawaSndMotuClass", Layout {size: size_of::<HinawaSndMotuClass>(), alignment: align_of::<HinawaSndMotuClass>()}),
+    ("HinawaSndTscm", Layout {size: size_of::<HinawaSndTscm>(), alignment: align_of::<HinawaSndTscm>()}),
+    ("HinawaSndTscmClass", Layout {size: size_of::<HinawaSndTscmClass>(), alignment: align_of::<HinawaSndTscmClass>()}),
+    ("HinawaSndUnit", Layout {size: size_of::<HinawaSndUnit>(), alignment: align_of::<HinawaSndUnit>()}),
+    ("HinawaSndUnitClass", Layout {size: size_of::<HinawaSndUnitClass>(), alignment: align_of::<HinawaSndUnitClass>()}),
+    ("HinawaSndUnitType", Layout {size: size_of::<HinawaSndUnitType>(), alignment: align_of::<HinawaSndUnitType>()}),
+];
+
+const RUST_CONSTANTS: &[(&str, &str)] = &[
+    ("(gint) HINAWA_FW_RCODE_ADDRESS_ERROR", "7"),
+    ("(gint) HINAWA_FW_RCODE_BUSY", "18"),
+    ("(gint) HINAWA_FW_RCODE_CANCELLED", "17"),
+    ("(gint) HINAWA_FW_RCODE_COMPLETE", "0"),
+    ("(gint) HINAWA_FW_RCODE_CONFLICT_ERROR", "4"),
+    ("(gint) HINAWA_FW_RCODE_DATA_ERROR", "5"),
+    ("(gint) HINAWA_FW_RCODE_GENERATION", "19"),
+    ("(gint) HINAWA_FW_RCODE_NO_ACK", "20"),
+    ("(gint) HINAWA_FW_RCODE_SEND_ERROR", "16"),
+    ("(gint) HINAWA_FW_RCODE_TYPE_ERROR", "6"),
+    ("(gint) HINAWA_FW_TCODE_CYCLE_START", "8"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_BOUNDED_ADD", "21"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_COMPARE_SWAP", "18"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_FETCH_ADD", "19"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_LITTLE_ADD", "20"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_MASK_SWAP", "17"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_REQUEST", "9"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_RESPONSE", "11"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_VENDOR_DEPENDENT", "23"),
+    ("(gint) HINAWA_FW_TCODE_LOCK_WRAP_ADD", "22"),
+    ("(gint) HINAWA_FW_TCODE_READ_BLOCK_REQUEST", "5"),
+    ("(gint) HINAWA_FW_TCODE_READ_BLOCK_RESPONSE", "7"),
+    ("(gint) HINAWA_FW_TCODE_READ_QUADLET_REQUEST", "4"),
+    ("(gint) HINAWA_FW_TCODE_READ_QUADLET_RESPONSE", "6"),
+    ("(gint) HINAWA_FW_TCODE_STREAM_DATA", "10"),
+    ("(gint) HINAWA_FW_TCODE_WRITE_BLOCK_REQUEST", "1"),
+    ("(gint) HINAWA_FW_TCODE_WRITE_QUADLET_REQUEST", "0"),
+    ("(gint) HINAWA_FW_TCODE_WRITE_RESPONSE", "2"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_BEBOB", "3"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_DICE", "1"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_DIGI00X", "5"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_FIREFACE", "8"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_FIREWORKS", "2"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_MOTU", "7"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_OXFW", "4"),
+    ("(gint) HINAWA_SND_UNIT_TYPE_TASCAM", "6"),
+];
+
+
diff --git a/hinawa-sys/tests/constant.c b/hinawa-sys/tests/constant.c
new file mode 100644
index 0000000..9836428
--- /dev/null
+++ b/hinawa-sys/tests/constant.c
@@ -0,0 +1,27 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
+#include "manual.h"
+#include <stdio.h>
+
+int main() {
+    printf(_Generic((ABI_CONSTANT_NAME),
+                    char *: "###gir test###%s###gir test###\n",
+                    const char *: "###gir test###%s###gir test###\n",
+                    char: "###gir test###%c###gir test###\n",
+                    signed char: "###gir test###%hhd###gir test###\n",
+                    unsigned char: "###gir test###%hhu###gir test###\n",
+                    short int: "###gir test###%hd###gir test###\n",
+                    unsigned short int: "###gir test###%hu###gir test###\n",
+                    int: "###gir test###%d###gir test###\n",
+                    unsigned int: "###gir test###%u###gir test###\n",
+                    long: "###gir test###%ld###gir test###\n",
+                    unsigned long: "###gir test###%lu###gir test###\n",
+                    long long: "###gir test###%lld###gir test###\n",
+                    unsigned long long: "###gir test###%llu###gir test###\n",
+                    double: "###gir test###%f###gir test###\n",
+                    long double: "###gir test###%ld###gir test###\n"),
+           ABI_CONSTANT_NAME);
+    return 0;
+}
diff --git a/hinawa-sys/tests/layout.c b/hinawa-sys/tests/layout.c
new file mode 100644
index 0000000..45f2ef4
--- /dev/null
+++ b/hinawa-sys/tests/layout.c
@@ -0,0 +1,12 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
+#include "manual.h"
+#include <stdalign.h>
+#include <stdio.h>
+
+int main() {
+    printf("%zu\n%zu", sizeof(ABI_TYPE_NAME), alignof(ABI_TYPE_NAME));
+    return 0;
+}
diff --git a/hinawa-sys/tests/manual.h b/hinawa-sys/tests/manual.h
new file mode 100644
index 0000000..33968c2
--- /dev/null
+++ b/hinawa-sys/tests/manual.h
@@ -0,0 +1,2 @@
+// Feel free to edit this file, it won't be regenerated by gir generator unless removed.
+
diff --git a/hinawa-sys/versions.txt b/hinawa-sys/versions.txt
index b83a599..0909d96 100644
--- a/hinawa-sys/versions.txt
+++ b/hinawa-sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb)
+Generated by gir (https://github.com/gtk-rs/gir @ 57dbee3)
 from gir-files (https://github.com/gtk-rs/gir-files @ c31e734)
diff --git a/hinawa/src/auto/enums.rs b/hinawa/src/auto/enums.rs
index 18fefa2..f63ec8b 100644
--- a/hinawa/src/auto/enums.rs
+++ b/hinawa/src/auto/enums.rs
@@ -15,6 +15,7 @@ use std::fmt;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
+#[non_exhaustive]
 pub enum FwRcode {
     Complete,
     ConflictError,
@@ -114,6 +115,7 @@ impl SetValue for FwRcode {
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
+#[non_exhaustive]
 pub enum FwTcode {
     WriteQuadletRequest,
     WriteBlockRequest,
@@ -245,6 +247,7 @@ impl SetValue for FwTcode {
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
+#[non_exhaustive]
 pub enum SndUnitType {
     Dice,
     Fireworks,
diff --git a/hinawa/src/auto/fw_fcp.rs b/hinawa/src/auto/fw_fcp.rs
index 39507ca..f1384bc 100644
--- a/hinawa/src/auto/fw_fcp.rs
+++ b/hinawa/src/auto/fw_fcp.rs
@@ -107,7 +107,7 @@ impl<O: IsA<FwFcp>> FwFcpExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::is-bound\0".as_ptr() as *const _,
-                Some(transmute(notify_is_bound_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_is_bound_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -121,7 +121,7 @@ impl<O: IsA<FwFcp>> FwFcpExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::timeout\0".as_ptr() as *const _,
-                Some(transmute(notify_timeout_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_timeout_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/fw_node.rs b/hinawa/src/auto/fw_node.rs
index 96e1174..daeff6d 100644
--- a/hinawa/src/auto/fw_node.rs
+++ b/hinawa/src/auto/fw_node.rs
@@ -152,7 +152,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"bus-update\0".as_ptr() as *const _,
-                Some(transmute(bus_update_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(bus_update_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -166,7 +166,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"disconnected\0".as_ptr() as *const _,
-                Some(transmute(disconnected_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(disconnected_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -180,7 +180,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::bus-manager-node-id\0".as_ptr() as *const _,
-                Some(transmute(notify_bus_manager_node_id_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_bus_manager_node_id_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -194,7 +194,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::generation\0".as_ptr() as *const _,
-                Some(transmute(notify_generation_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_generation_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -208,7 +208,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::ir-manager-node-id\0".as_ptr() as *const _,
-                Some(transmute(notify_ir_manager_node_id_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_ir_manager_node_id_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -222,7 +222,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::local-node-id\0".as_ptr() as *const _,
-                Some(transmute(notify_local_node_id_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_local_node_id_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -236,7 +236,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::node-id\0".as_ptr() as *const _,
-                Some(transmute(notify_node_id_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_node_id_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -250,7 +250,7 @@ impl<O: IsA<FwNode>> FwNodeExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::root-node-id\0".as_ptr() as *const _,
-                Some(transmute(notify_root_node_id_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_root_node_id_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/fw_req.rs b/hinawa/src/auto/fw_req.rs
index ae96a18..499c005 100644
--- a/hinawa/src/auto/fw_req.rs
+++ b/hinawa/src/auto/fw_req.rs
@@ -73,7 +73,7 @@ impl<O: IsA<FwReq>> FwReqExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::timeout\0".as_ptr() as *const _,
-                Some(transmute(notify_timeout_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_timeout_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/fw_resp.rs b/hinawa/src/auto/fw_resp.rs
index d84d069..68b1a98 100644
--- a/hinawa/src/auto/fw_resp.rs
+++ b/hinawa/src/auto/fw_resp.rs
@@ -99,7 +99,7 @@ impl<O: IsA<FwResp>> FwRespExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"requested\0".as_ptr() as *const _,
-                Some(transmute(requested_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(requested_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -113,7 +113,7 @@ impl<O: IsA<FwResp>> FwRespExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::is-reserved\0".as_ptr() as *const _,
-                Some(transmute(notify_is_reserved_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_is_reserved_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/snd_dg00x.rs b/hinawa/src/auto/snd_dg00x.rs
index c36c43b..368110d 100644
--- a/hinawa/src/auto/snd_dg00x.rs
+++ b/hinawa/src/auto/snd_dg00x.rs
@@ -66,7 +66,7 @@ impl<O: IsA<SndDg00x>> SndDg00xExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"message\0".as_ptr() as *const _,
-                Some(transmute(message_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(message_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/snd_dice.rs b/hinawa/src/auto/snd_dice.rs
index 093ad59..afa80d1 100644
--- a/hinawa/src/auto/snd_dice.rs
+++ b/hinawa/src/auto/snd_dice.rs
@@ -77,7 +77,7 @@ impl<O: IsA<SndDice>> SndDiceExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notified\0".as_ptr() as *const _,
-                Some(transmute(notified_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notified_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/snd_motu.rs b/hinawa/src/auto/snd_motu.rs
index e7032f1..821e70b 100644
--- a/hinawa/src/auto/snd_motu.rs
+++ b/hinawa/src/auto/snd_motu.rs
@@ -66,7 +66,7 @@ impl<O: IsA<SndMotu>> SndMotuExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notified\0".as_ptr() as *const _,
-                Some(transmute(notified_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notified_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/snd_tscm.rs b/hinawa/src/auto/snd_tscm.rs
index 0b78223..fb99b5c 100644
--- a/hinawa/src/auto/snd_tscm.rs
+++ b/hinawa/src/auto/snd_tscm.rs
@@ -66,7 +66,7 @@ impl<O: IsA<SndTscm>> SndTscmExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"control\0".as_ptr() as *const _,
-                Some(transmute(control_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(control_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/snd_unit.rs b/hinawa/src/auto/snd_unit.rs
index 7cb293e..8e2731b 100644
--- a/hinawa/src/auto/snd_unit.rs
+++ b/hinawa/src/auto/snd_unit.rs
@@ -163,7 +163,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"disconnected\0".as_ptr() as *const _,
-                Some(transmute(disconnected_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(disconnected_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -177,7 +177,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"lock-status\0".as_ptr() as *const _,
-                Some(transmute(lock_status_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(lock_status_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -191,7 +191,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::card\0".as_ptr() as *const _,
-                Some(transmute(notify_card_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_card_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -205,7 +205,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::device\0".as_ptr() as *const _,
-                Some(transmute(notify_device_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_device_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -219,7 +219,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::guid\0".as_ptr() as *const _,
-                Some(transmute(notify_guid_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_guid_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -233,7 +233,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::streaming\0".as_ptr() as *const _,
-                Some(transmute(notify_streaming_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_streaming_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 
@@ -247,7 +247,7 @@ impl<O: IsA<SndUnit>> SndUnitExt for O {
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"notify::type\0".as_ptr() as *const _,
-                Some(transmute(notify_type_trampoline::<Self, F> as usize)), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(notify_type_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
         }
     }
 }
diff --git a/hinawa/src/auto/versions.txt b/hinawa/src/auto/versions.txt
index b83a599..0909d96 100644
--- a/hinawa/src/auto/versions.txt
+++ b/hinawa/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb)
+Generated by gir (https://github.com/gtk-rs/gir @ 57dbee3)
 from gir-files (https://github.com/gtk-rs/gir-files @ c31e734)