From 8227b0240ba5419168796de23251f1bb4a966da4 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 3 Mar 2023 14:25:10 +0300
Subject: [PATCH] fix timidity build after U16 audio format removal.
---
src/codecs/timidity/output.c | 26 --------------------------
src/codecs/timidity/output.h | 6 ------
src/codecs/timidity/timidity.c | 6 ------
3 files changed, 38 deletions(-)
diff --git a/src/codecs/timidity/output.c b/src/codecs/timidity/output.c
index 69d7cc2c..8bab4c40 100644
--- a/src/codecs/timidity/output.c
+++ b/src/codecs/timidity/output.c
@@ -57,19 +57,6 @@ void timi_s32tos16(void *dp, Sint32 *lp, Sint32 c)
}
}
-void timi_s32tou16(void *dp, Sint32 *lp, Sint32 c)
-{
- Uint16 *sp=(Uint16 *)(dp);
- Sint32 l;
- while (c--)
- {
- l=(*lp++)>>(32-16-GUARD_BITS);
- if (l > 32767) l=32767;
- else if (l<-32768) l=-32768;
- *sp++ = 0x8000 ^ (Uint16)(l);
- }
-}
-
void timi_s32tos16x(void *dp, Sint32 *lp, Sint32 c)
{
Sint16 *sp=(Sint16 *)(dp);
@@ -83,19 +70,6 @@ void timi_s32tos16x(void *dp, Sint32 *lp, Sint32 c)
}
}
-void timi_s32tou16x(void *dp, Sint32 *lp, Sint32 c)
-{
- Uint16 *sp=(Uint16 *)(dp);
- Sint32 l;
- while (c--)
- {
- l=(*lp++)>>(32-16-GUARD_BITS);
- if (l > 32767) l=32767;
- else if (l<-32768) l=-32768;
- *sp++ = SDL_Swap16(0x8000 ^ (Uint16)(l));
- }
-}
-
void timi_s32tof32(void *dp, Sint32 *lp, Sint32 c)
{
float *sp=(float *)(dp);
diff --git a/src/codecs/timidity/output.h b/src/codecs/timidity/output.h
index 3a08f5bb..6451db3f 100644
--- a/src/codecs/timidity/output.h
+++ b/src/codecs/timidity/output.h
@@ -27,11 +27,9 @@ extern void timi_s32tou8(void *dp, Sint32 *lp, Sint32 c);
/* 16-bit */
extern void timi_s32tos16(void *dp, Sint32 *lp, Sint32 c);
-extern void timi_s32tou16(void *dp, Sint32 *lp, Sint32 c);
/* byte-exchanged 16-bit */
extern void timi_s32tos16x(void *dp, Sint32 *lp, Sint32 c);
-extern void timi_s32tou16x(void *dp, Sint32 *lp, Sint32 c);
/* 32-bit */
extern void timi_s32tof32(void *dp, Sint32 *lp, Sint32 c);
@@ -42,15 +40,11 @@ extern void timi_s32tos32x(void *dp, Sint32 *lp, Sint32 c);
/* little-endian and big-endian specific */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define timi_s32tou16l timi_s32tou16
-#define timi_s32tou16b timi_s32tou16x
#define timi_s32tos16l timi_s32tos16
#define timi_s32tos16b timi_s32tos16x
#define timi_s32tos32l timi_s32tos32
#define timi_s32tos32b timi_s32tos32x
#else
-#define timi_s32tou16l timi_s32tou16x
-#define timi_s32tou16b timi_s32tou16
#define timi_s32tos16l timi_s32tos16x
#define timi_s32tos16b timi_s32tos16
#define timi_s32tos32l timi_s32tos32x
diff --git a/src/codecs/timidity/timidity.c b/src/codecs/timidity/timidity.c
index 76925c5d..e0325fd0 100644
--- a/src/codecs/timidity/timidity.c
+++ b/src/codecs/timidity/timidity.c
@@ -564,12 +564,6 @@ static void do_song_load(SDL_RWops *rw, SDL_AudioSpec *audio, MidiSong **out)
case AUDIO_S16MSB:
song->write = timi_s32tos16b;
break;
- case AUDIO_U16LSB:
- song->write = timi_s32tou16l;
- break;
- case AUDIO_U16MSB:
- song->write = timi_s32tou16b;
- break;
case AUDIO_S32LSB:
song->write = timi_s32tos32l;
break;