From 95681c3959f8605b91f554534a50d7c1e31a085d Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Tue, 10 Dec 2024 08:59:00 -0500
Subject: [PATCH] Revert "libmad synth.c silence warnings try #2"

This reverts commit 56500073998d62f74e4fca0bff422bc73eef058a.

Reason for revert:  Results in warnings on *all* device builds.

Change-Id: I635be6791c3ea9c7d7e89f9cf5dd2e4e4e042a80
---
 lib/rbcodec/codecs/libmad/synth.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/rbcodec/codecs/libmad/synth.c b/lib/rbcodec/codecs/libmad/synth.c
index 14d7c21025..ebcf3d5015 100644
--- a/lib/rbcodec/codecs/libmad/synth.c
+++ b/lib/rbcodec/codecs/libmad/synth.c
@@ -689,8 +689,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
   int sb;
   unsigned int phase, ch, s, p;
   mad_fixed_t *pcm, (*filter)[2][2][16][8];
-  mad_fixed_t const (*sbsample)[36][32];
-  mad_fixed_t const (*fe)[8], (*fx)[8], (*fo)[8];
+  mad_fixed_t (*sbsample)[36][32];
+  mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
   mad_fixed_t const (*D0ptr)[32];
   mad_fixed_t const (*D1ptr)[32];
   mad_fixed64hi_t hi0, hi1;
@@ -712,8 +712,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
       fx = &(*filter)[0][~phase & 1][0];
       fo = &(*filter)[1][~phase & 1][0];
 
-      D0ptr = (mad_fixed_t const (*)[32])(D[0]+p);
-      D1ptr = (mad_fixed_t const (*)[32])(D[0]-p);
+      D0ptr = (void*)&D[0][ p];
+      D1ptr = (void*)&D[0][-p];
 
       if(s & 1)
       {
@@ -838,8 +838,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
   int          p;
   unsigned int phase, ch, s;
   mad_fixed_t *pcm, (*filter)[2][2][16][8];
-  mad_fixed_t const (*sbsample)[36][32];
-  mad_fixed_t const (*fe)[8], (*fx)[8], (*fo)[8];
+  mad_fixed_t  (*sbsample)[36][32];
+  mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
   mad_fixed_t const (*D0ptr)[32], *ptr;
   mad_fixed_t const (*D1ptr)[32];
   mad_fixed64hi_t hi;
@@ -862,8 +862,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
       fx = &(*filter)[0][~phase & 1][0];
       fo = &(*filter)[1][~phase & 1][0];
 
-      D0ptr = (mad_fixed_t const (*)[32])(D[0]+p);
-      D1ptr = (mad_fixed_t const (*)[32])(D[0]-p);
+      D0ptr = (void*)&D[0][ p];
+      D1ptr = (void*)&D[0][-p];
 
       if(s & 1)
       {
@@ -957,8 +957,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
   int          p, sb;
   unsigned int phase, ch, s;
   mad_fixed_t *pcm, (*filter)[2][2][16][8];
-  mad_fixed_t const (*sbsample)[36][32];
-  mad_fixed_t const (*fe)[8], (*fx)[8], (*fo)[8];
+  mad_fixed_t (*sbsample)[36][32];
+  mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
   mad_fixed_t const (*D0ptr)[32], *ptr;
   mad_fixed_t const (*D1ptr)[32];
   mad_fixed64hi_t hi;
@@ -981,8 +981,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
       fx = &(*filter)[0][~phase & 1][0];
       fo = &(*filter)[1][~phase & 1][0];
 
-      D0ptr = (mad_fixed_t const (*)[32])(D[0]+p);
-      D1ptr = (mad_fixed_t const (*)[32])(D[0]-p);
+      D0ptr = (void*)&D[0][ p];
+      D1ptr = (void*)&D[0][-p];
 
       if(s & 1)
       {