Use a fixed array instead of a list for sound drivers

ccawley2011 · ccawley2011 · commit f541dab4b5e3 · 2024-06-27T12:49:49.000+01:00
diff --git a/src/main.c b/src/main.c
@@ -45,7 +45,7 @@
 #include <windows.h>
 #endif
 
-static struct sound_driver *sound;
+static const struct sound_driver *sound;
 static unsigned int foreground_in, foreground_out;
 static int refresh_status;
 
@@ -269,8 +269,6 @@ int main(int argc, char **argv)
 	srand(tv.tv_usec);
 #endif
 
-	init_sound_drivers();
-
 	memset(&opt, 0, sizeof (struct options));
 	memset(&control, 0, sizeof (struct control));
 
diff --git a/src/options.c b/src/options.c
@@ -17,11 +17,8 @@
 
 #include "common.h"
 #include "sound.h"
-#include "list.h"
 #include "xmp_version.h"
 
-extern struct list_head sound_driver_list;
-
 enum {
 	OPT_FX9BUG = 0x105,
 	OPT_PROBEONLY,
@@ -51,22 +48,22 @@ struct player_mode pmode[] = {
 
 static void usage(char *s, struct options *options)
 {
-	struct list_head *head;
-	struct sound_driver *sd;
+	const struct sound_driver *sd;
 	struct player_mode *pm;
 	const char *const *hlp;
+	int i;
 
 	printf("Usage: %s [options] [modules]\n", s);
 
 	printf("\nAvailable drivers:\n");
 
-	list_for_each(head, &sound_driver_list) {
-		sd = list_entry(head, struct sound_driver, list);
+	for (i = 0; sound_driver_list[i] != NULL; i++) {
+		sd = sound_driver_list[i];
 		printf("    %s (%s)\n", sd->id, sd->description);
 	}
 
-	list_for_each(head, &sound_driver_list) {
-		sd = list_entry(head, struct sound_driver, list);
+	for (i = 0; sound_driver_list[i] != NULL; i++) {
+		sd = sound_driver_list[i];
 		if (sd->help)
 			printf("\n%s options:\n", sd->description);
 		for (hlp = sd->help; hlp && *hlp; hlp += 2)
diff --git a/src/sound.c b/src/sound.c
@@ -10,93 +10,86 @@
 #include <string.h>
 #include "sound.h"
 
-LIST_HEAD(sound_driver_list);
-
-static void register_sound_driver(struct sound_driver *sd)
-{
-	list_add_tail(&sd->list, &sound_driver_list);	
-}
-
-void init_sound_drivers(void)
-{
+const struct sound_driver *const sound_driver_list[] = {
 #ifdef SOUND_AHI
-	register_sound_driver(&sound_ahi);
+	&sound_ahi,
 #endif
 #ifdef SOUND_BEOS
-	register_sound_driver(&sound_beos);
+	&sound_beos,
 #endif
 #ifdef SOUND_SNDIO
-	register_sound_driver(&sound_sndio);
+	&sound_sndio,
 #endif
 #ifdef SOUND_NETBSD
-	register_sound_driver(&sound_netbsd);
+	&sound_netbsd,
 #endif
 #ifdef SOUND_BSD
-	register_sound_driver(&sound_bsd);
+	&sound_bsd,
 #endif
 #ifdef SOUND_SOLARIS
-	register_sound_driver(&sound_solaris);
+	&sound_solaris,
 #endif
 #ifdef SOUND_SGI
-	register_sound_driver(&sound_sgi);
+	&sound_sgi,
 #endif
 #ifdef SOUND_HPUX
-	register_sound_driver(&sound_hpux);
+	&sound_hpux,
 #endif
 #ifdef SOUND_AIX
-	register_sound_driver(&sound_aix);
+	&sound_aix,
 #endif
 #ifdef SOUND_COREAUDIO
-	register_sound_driver(&sound_coreaudio);
+	&sound_coreaudio,
 #endif
 #ifdef SOUND_OS2DART
-	register_sound_driver(&sound_os2dart);
+	&sound_os2dart,
 #endif
 #ifdef SOUND_WIN32
-	register_sound_driver(&sound_win32);
+	&sound_win32,
 #endif
 #ifdef SOUND_PULSEAUDIO
-	register_sound_driver(&sound_pulseaudio);
+	&sound_pulseaudio,
 #endif
 #ifdef SOUND_ALSA
-	register_sound_driver(&sound_alsa);
+	&sound_alsa,
 #endif
 #ifdef SOUND_ALSA05
-	register_sound_driver(&sound_alsa05);
+	&sound_alsa05,
 #endif
 #ifdef SOUND_OSS
-	register_sound_driver(&sound_oss);
+	&sound_oss,
 #endif
 #ifdef SOUND_QNX
-	register_sound_driver(&sound_qnx);
+	&sound_qnx,
 #endif
 #ifdef SOUND_SB
-	register_sound_driver(&sound_sb);
-#endif
-	register_sound_driver(&sound_wav);
-	register_sound_driver(&sound_aiff);
-	register_sound_driver(&sound_file);
-	register_sound_driver(&sound_null);
-}
+	&sound_sb,
+#endif
+	&sound_wav,
+	&sound_aiff,
+	&sound_file,
+	&sound_null,
+	NULL
+};
 
-struct sound_driver *select_sound_driver(struct options *options)
+const struct sound_driver *select_sound_driver(struct options *options)
 {
-	struct list_head *head;
-	struct sound_driver *sd;
+	const struct sound_driver *sd;
 	const char *pref = options->driver_id;
+	int i;
 
 	if (pref) {
-		list_for_each(head, &sound_driver_list) {
-			sd = list_entry(head, struct sound_driver, list);
+		for (i = 0; sound_driver_list[i] != NULL; i++) {
+			sd = sound_driver_list[i];
 			if (strcmp(sd->id, pref) == 0) {
 				if (sd->init(options) == 0) {
 					return sd;
 				}
 			}
 		}
 	} else {
-		list_for_each(head, &sound_driver_list) {
-			sd = list_entry(head, struct sound_driver, list);
+		for (i = 0; sound_driver_list[i] != NULL; i++) {
+			sd = sound_driver_list[i];
 			/* Probing */
 			if (sd->init(options) == 0) {
 				/* found */
diff --git a/src/sound.h b/src/sound.h
@@ -4,7 +4,6 @@
 #include <stdio.h>
 
 #include "common.h"
-#include "list.h"
 
 struct sound_driver {
 	const char *id;
@@ -16,31 +15,32 @@ struct sound_driver {
 	void (*flush)(void);
 	void (*pause)(void);
 	void (*resume)(void);
-	struct list_head list;
 };
 
-extern struct sound_driver sound_null;
-extern struct sound_driver sound_wav;
-extern struct sound_driver sound_aiff;
-extern struct sound_driver sound_file;
-extern struct sound_driver sound_qnx;
-extern struct sound_driver sound_alsa05;
-extern struct sound_driver sound_oss;
-extern struct sound_driver sound_alsa;
-extern struct sound_driver sound_os2dart;
-extern struct sound_driver sound_win32;
-extern struct sound_driver sound_pulseaudio;
-extern struct sound_driver sound_coreaudio;
-extern struct sound_driver sound_hpux;
-extern struct sound_driver sound_sndio;
-extern struct sound_driver sound_sgi;
-extern struct sound_driver sound_solaris;
-extern struct sound_driver sound_netbsd;
-extern struct sound_driver sound_bsd;
-extern struct sound_driver sound_beos;
-extern struct sound_driver sound_aix;
-extern struct sound_driver sound_ahi;
-extern struct sound_driver sound_sb;
+extern const struct sound_driver sound_null;
+extern const struct sound_driver sound_wav;
+extern const struct sound_driver sound_aiff;
+extern const struct sound_driver sound_file;
+extern const struct sound_driver sound_qnx;
+extern const struct sound_driver sound_alsa05;
+extern       struct sound_driver sound_oss;
+extern const struct sound_driver sound_alsa;
+extern const struct sound_driver sound_os2dart;
+extern const struct sound_driver sound_win32;
+extern const struct sound_driver sound_pulseaudio;
+extern const struct sound_driver sound_coreaudio;
+extern const struct sound_driver sound_hpux;
+extern const struct sound_driver sound_sndio;
+extern const struct sound_driver sound_sgi;
+extern const struct sound_driver sound_solaris;
+extern const struct sound_driver sound_netbsd;
+extern const struct sound_driver sound_bsd;
+extern const struct sound_driver sound_beos;
+extern const struct sound_driver sound_aix;
+extern const struct sound_driver sound_ahi;
+extern const struct sound_driver sound_sb;
+
+extern const struct sound_driver *const sound_driver_list[];
 
 #define parm_init(p) { char *token; for (; *(p); (p)++) { \
 	char s[80]; strncpy(s, *(p), 79); s[79] = 0; \
@@ -64,7 +64,7 @@ static inline int is_big_endian(void) {
 }
 
 void init_sound_drivers(void);
-struct sound_driver *select_sound_driver(struct options *);
+const struct sound_driver *select_sound_driver(struct options *);
 void convert_endian(unsigned char *, int);
 
 #endif
diff --git a/src/sound_ahi.c b/src/sound_ahi.c
@@ -137,7 +137,7 @@ static void onpause(void) {
 static void onresume(void) {
 }
 
-struct sound_driver sound_ahi = {
+const struct sound_driver sound_ahi = {
     "ahi",
     "Amiga AHI audio",
     NULL,
diff --git a/src/sound_aiff.c b/src/sound_aiff.c
@@ -152,7 +152,7 @@ static void onresume(void)
 {
 }
 
-struct sound_driver sound_aiff = {
+const struct sound_driver sound_aiff = {
 	"aiff",
 	"AIFF writer",
 	NULL,
diff --git a/src/sound_aix.c b/src/sound_aix.c
@@ -124,7 +124,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_bsd = {
+const struct sound_driver sound_bsd = {
 	"aix",
 	"AIX PCM audio",
 	help,
diff --git a/src/sound_alsa.c b/src/sound_alsa.c
@@ -116,7 +116,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_alsa = {
+const struct sound_driver sound_alsa = {
 	"alsa",
 	"ALSA PCM audio",
 	help,
diff --git a/src/sound_alsa05.c b/src/sound_alsa05.c
@@ -200,7 +200,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_alsa05 = {
+const struct sound_driver sound_alsa05 = {
 	"alsa05",		/* driver ID */
 	"ALSA 0.5 PCM audio",	/* driver description */
 	help,			/* help */
diff --git a/src/sound_beos.cpp b/src/sound_beos.cpp
@@ -42,7 +42,7 @@ static void flush(void);
 static void onpause(void);
 static void onresume(void);
 
-struct sound_driver sound_beos = {
+const struct sound_driver sound_beos = {
 	"beos",
 	"BeOS PCM audio",
 	help,
diff --git a/src/sound_bsd.c b/src/sound_bsd.c
@@ -100,7 +100,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_bsd = {
+const struct sound_driver sound_bsd = {
 	"bsd",
 	"BSD PCM audio",
 	help,
diff --git a/src/sound_coreaudio.c b/src/sound_coreaudio.c
@@ -267,7 +267,7 @@ static void onresume(void)
 	AudioOutputUnitStart(au);
 }
 
-struct sound_driver sound_coreaudio = {
+const struct sound_driver sound_coreaudio = {
 	"coreaudio",
 	"CoreAudio sound output",
 	NULL,
diff --git a/src/sound_dart.c b/src/sound_dart.c
@@ -219,7 +219,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_os2dart = {
+const struct sound_driver sound_os2dart = {
 	"dart",
 	"OS/2 Direct Audio Realtime",
 	help,
diff --git a/src/sound_file.c b/src/sound_file.c
@@ -78,7 +78,7 @@ static const char * const help[] = {
 	NULL
 };
 
-struct sound_driver sound_file = {
+const struct sound_driver sound_file = {
 	"file",
 	"Raw file writer",
 	help,
diff --git a/src/sound_hpux.c b/src/sound_hpux.c
@@ -146,7 +146,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_hpux = {
+const struct sound_driver sound_hpux = {
 	"hpux",
 	"HP-UX PCM audio",
 	help,
diff --git a/src/sound_netbsd.c b/src/sound_netbsd.c
@@ -130,7 +130,7 @@ static const char *const help[] = {
 	NULL
 };
 
-struct sound_driver sound_netbsd = {
+const struct sound_driver sound_netbsd = {
 	"netbsd",
 	"NetBSD PCM audio",
 	help,
diff --git a/src/sound_null.c b/src/sound_null.c
@@ -35,7 +35,7 @@ static void onresume(void)
 }
 
 
-struct sound_driver sound_null = {
+const struct sound_driver sound_null = {
 	"null",
 	"null output",
 	NULL,
diff --git a/src/sound_oss.c b/src/sound_oss.c
@@ -204,6 +204,7 @@ static const char *const help[] = {
 	NULL
 };
 
+/* TODO: Make this const to match the other drivers */
 struct sound_driver sound_oss = {
 	"oss",
 	"OSS PCM audio",
diff --git a/src/sound_pulseaudio.c b/src/sound_pulseaudio.c
@@ -82,7 +82,7 @@ static void onresume(void)
 {
 }
 
-struct sound_driver sound_pulseaudio = {
+const struct sound_driver sound_pulseaudio = {
 	"pulseaudio",
 	"PulseAudio sound output",
 	NULL,
diff --git a/src/sound_qnx.c b/src/sound_qnx.c
diff --git a/src/sound_sb.c b/src/sound_sb.c
diff --git a/src/sound_sgi.c b/src/sound_sgi.c
diff --git a/src/sound_sndio.c b/src/sound_sndio.c
diff --git a/src/sound_solaris.c b/src/sound_solaris.c
diff --git a/src/sound_wav.c b/src/sound_wav.c
diff --git a/src/sound_win32.c b/src/sound_win32.c

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static void onpause(void) {`
`137`	`137`	`static void onresume(void) {`
`138`	`138`	`}`
`139`	`139`
`140`		`-struct sound_driver sound_ahi = {`
	`140`	`+const struct sound_driver sound_ahi = {`
`141`	`141`	`"ahi",`
`142`	`142`	`"Amiga AHI audio",`
`143`	`143`	`NULL,`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ static void onresume(void)`
`152`	`152`	`{`
`153`	`153`	`}`
`154`	`154`
`155`		`-struct sound_driver sound_aiff = {`
	`155`	`+const struct sound_driver sound_aiff = {`
`156`	`156`	`"aiff",`
`157`	`157`	`"AIFF writer",`
`158`	`158`	`NULL,`