From 6b11b8b7510fde999e8d552185ef2786c5a29308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 10 Aug 2017 10:51:22 +0300 Subject: [PATCH] Explicitely ignore native endianness audio formats We have to handle them separately depending on the current configuration, and do so. Also fix things up there. --- Gir_GstAudio.toml | 74 ++++++++++++++++++++++- gstreamer-audio/src/audio_format_info.rs | 16 ++--- gstreamer-audio/src/auto/enums.rs | 2 +- gstreamer-audio/src/auto/flags.rs | 2 +- gstreamer-audio/src/auto/mod.rs | 2 +- gstreamer-audio/src/auto/stream_volume.rs | 2 +- 6 files changed, 85 insertions(+), 13 deletions(-) diff --git a/Gir_GstAudio.toml b/Gir_GstAudio.toml index cc01adb21..c52ac73cb 100644 --- a/Gir_GstAudio.toml +++ b/Gir_GstAudio.toml @@ -16,7 +16,6 @@ external_libraries = [ generate = [ "GstAudio.AudioFlags", - "GstAudio.AudioFormat", "GstAudio.AudioFormatFlags", "GstAudio.AudioLayout", "GstAudio.AudioPackFlags", @@ -37,3 +36,76 @@ name = "Gst.Caps" status = "manual" ref_mode = "ref" +[[object]] +name = "GstAudio.AudioFormat" +status = "generate" + + [[object.member]] + name = "s16" + # Platform dependant + ignore = true + + [[object.member]] + name = "u16" + # Platform dependant + ignore = true + + [[object.member]] + name = "s24_32" + # Platform dependant + ignore = true + + [[object.member]] + name = "u24_32" + # Platform dependant + ignore = true + + [[object.member]] + name = "s32" + # Platform dependant + ignore = true + + [[object.member]] + name = "u32" + # Platform dependant + ignore = true + + [[object.member]] + name = "s24" + # Platform dependant + ignore = true + + [[object.member]] + name = "u24" + # Platform dependant + ignore = true + + [[object.member]] + name = "s20" + # Platform dependant + ignore = true + + [[object.member]] + name = "u20" + # Platform dependant + ignore = true + + [[object.member]] + name = "s18" + # Platform dependant + ignore = true + + [[object.member]] + name = "u18" + # Platform dependant + ignore = true + + [[object.member]] + name = "f32" + # Platform dependant + ignore = true + + [[object.member]] + name = "f64" + # Platform dependant + ignore = true diff --git a/gstreamer-audio/src/audio_format_info.rs b/gstreamer-audio/src/audio_format_info.rs index 647713abe..eeb6639c9 100644 --- a/gstreamer-audio/src/audio_format_info.rs +++ b/gstreamer-audio/src/audio_format_info.rs @@ -90,19 +90,19 @@ pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432be; #[cfg(target_endian = "big")] pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32be; #[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::S32be; +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32be; #[cfg(target_endian = "big")] pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24be; #[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::S24be; +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24be; #[cfg(target_endian = "big")] pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20be; #[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::S20be; +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20be; #[cfg(target_endian = "big")] pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18be; #[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::S18be; +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18be; #[cfg(target_endian = "big")] pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32be; #[cfg(target_endian = "big")] @@ -119,19 +119,19 @@ pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432le; #[cfg(target_endian = "little")] pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32le; #[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::S32le; +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32le; #[cfg(target_endian = "little")] pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24le; #[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::S24le; +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24le; #[cfg(target_endian = "little")] pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20le; #[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::S20le; +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20le; #[cfg(target_endian = "little")] pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18le; #[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::S18le; +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18le; #[cfg(target_endian = "little")] pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32le; #[cfg(target_endian = "little")] diff --git a/gstreamer-audio/src/auto/enums.rs b/gstreamer-audio/src/auto/enums.rs index 4085caa4e..53a0892d1 100644 --- a/gstreamer-audio/src/auto/enums.rs +++ b/gstreamer-audio/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (cf27827) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-audio/src/auto/flags.rs b/gstreamer-audio/src/auto/flags.rs index a9a93681c..3d539c547 100644 --- a/gstreamer-audio/src/auto/flags.rs +++ b/gstreamer-audio/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (cf27827) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-audio/src/auto/mod.rs b/gstreamer-audio/src/auto/mod.rs index c186dd497..fcd6313b7 100644 --- a/gstreamer-audio/src/auto/mod.rs +++ b/gstreamer-audio/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (cf27827) from gir-files (???) // DO NOT EDIT mod stream_volume; diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs index 60c80ea56..a643ff3cc 100644 --- a/gstreamer-audio/src/auto/stream_volume.rs +++ b/gstreamer-audio/src/auto/stream_volume.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (cf27827) from gir-files (???) // DO NOT EDIT use StreamVolumeFormat;