Codebase list rust-stfu8 / 0cce718
gstreamer-audio: Update to array-init 0.1 Sebastian Dröge 4 years ago
3 changed file(s) with 140 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
+1
-1
src/gstreamer-audio/debian/changelog less more
0 rust-gstreamer-audio (0.14.5-1) unstable; urgency=medium
0 rust-gstreamer-audio (0.14.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
11
22 * Package gstreamer-audio 0.14.5 from crates.io using debcargo 2.4.0
33
+1
-0
src/gstreamer-audio/debian/patches/series less more
0 update-to-array-init-0.1.patch
+138
-0
src/gstreamer-audio/debian/patches/update-to-array-init-0.1.patch less more
0 Index: gstreamer-audio/Cargo.toml
1 ===================================================================
2 --- gstreamer-audio.orig/Cargo.toml
3 +++ gstreamer-audio/Cargo.toml
4 @@ -24,7 +24,7 @@ categories = ["api-bindings", "multimedi
5 license = "MIT/Apache-2.0"
6 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
7 [dependencies.array-init]
8 -version = "0.0"
9 +version = "0.1"
10
11 [dependencies.bitflags]
12 version = "1.0"
13 Index: gstreamer-audio/src/audio_channel_position.rs
14 ===================================================================
15 --- gstreamer-audio.orig/src/audio_channel_position.rs
16 +++ gstreamer-audio/src/audio_channel_position.rs
17 @@ -39,7 +39,7 @@ impl AudioChannelPosition {
18 }
19
20 let positions_raw: [gst_audio_sys::GstAudioChannelPosition; 64] =
21 - array_init::array_init_copy(|i| {
22 + array_init::array_init(|i| {
23 if i >= len as usize {
24 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
25 } else {
26 @@ -107,7 +107,7 @@ impl AudioChannelPosition {
27
28 let len = positions.len();
29 let mut positions_raw: [gst_audio_sys::GstAudioChannelPosition; 64] =
30 - array_init::array_init_copy(|i| {
31 + array_init::array_init(|i| {
32 if i >= len as usize {
33 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
34 } else {
35 @@ -152,7 +152,7 @@ impl AudioChannelPosition {
36
37 let len = positions.len();
38 let positions_raw: [gst_audio_sys::GstAudioChannelPosition; 64] =
39 - array_init::array_init_copy(|i| {
40 + array_init::array_init(|i| {
41 if i >= len as usize {
42 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
43 } else {
44 @@ -186,7 +186,7 @@ pub fn buffer_reorder_channels(
45 let from_len = from.len();
46 let to_len = to.len();
47
48 - let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
49 + let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
50 if i >= from_len as usize {
51 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
52 } else {
53 @@ -194,7 +194,7 @@ pub fn buffer_reorder_channels(
54 }
55 });
56
57 - let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
58 + let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
59 if i >= to_len as usize {
60 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
61 } else {
62 @@ -235,7 +235,7 @@ pub fn reorder_channels(
63 let from_len = from.len();
64 let to_len = to.len();
65
66 - let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
67 + let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
68 if i >= from_len as usize {
69 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
70 } else {
71 @@ -243,7 +243,7 @@ pub fn reorder_channels(
72 }
73 });
74
75 - let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
76 + let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
77 if i >= to_len as usize {
78 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
79 } else {
80 @@ -283,7 +283,7 @@ pub fn get_channel_reorder_map(
81 let from_len = from.len();
82 let to_len = to.len();
83
84 - let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
85 + let from_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
86 if i >= from_len as usize {
87 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
88 } else {
89 @@ -291,7 +291,7 @@ pub fn get_channel_reorder_map(
90 }
91 });
92
93 - let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
94 + let to_raw: [gst_audio_sys::GstAudioChannelPosition; 64] = array_init::array_init(|i| {
95 if i >= to_len as usize {
96 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
97 } else {
98 Index: gstreamer-audio/src/audio_info.rs
99 ===================================================================
100 --- gstreamer-audio.orig/src/audio_info.rs
101 +++ gstreamer-audio/src/audio_info.rs
102 @@ -59,7 +59,7 @@ impl<'a> AudioInfoBuilder<'a> {
103 }
104
105 let positions: [gst_audio_sys::GstAudioChannelPosition; 64] =
106 - array_init::array_init_copy(|i| {
107 + array_init::array_init(|i| {
108 if i >= self.channels as usize {
109 gst_audio_sys::GST_AUDIO_CHANNEL_POSITION_INVALID
110 } else {
111 @@ -107,7 +107,7 @@ impl<'a> AudioInfoBuilder<'a> {
112 info.layout = layout.to_glib();
113 }
114
115 - let positions = array_init::array_init_copy(|i| from_glib(info.position[i]));
116 + let positions = array_init::array_init(|i| from_glib(info.position[i]));
117 Some(AudioInfo(info, positions))
118 }
119 }
120 @@ -158,7 +158,7 @@ impl AudioInfo {
121 &mut info,
122 caps.as_ptr(),
123 )) {
124 - let positions = array_init::array_init_copy(|i| from_glib(info.position[i]));
125 + let positions = array_init::array_init(|i| from_glib(info.position[i]));
126 Some(AudioInfo(info, positions))
127 } else {
128 None
129 @@ -380,7 +380,7 @@ impl glib::translate::FromGlibPtrNone<*m
130 unsafe fn from_glib_none(ptr: *mut gst_audio_sys::GstAudioInfo) -> Self {
131 AudioInfo(
132 ptr::read(ptr),
133 - array_init::array_init_copy(|i| from_glib((*ptr).position[i])),
134 + array_init::array_init(|i| from_glib((*ptr).position[i])),
135 )
136 }
137 }