From 526dac4670ea10fceac84d432b70367bcc125f41 Mon Sep 17 00:00:00 2001
From: Claudio Matsuoka <cmatsuoka@gmail.com>
Date: Fri, 30 Mar 2012 07:30:43 -0300
Subject: [PATCH] [xmp] Mass update on to-be-ported old drivers

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
---
 src/drivers/aix.c        |  2 +-
 src/drivers/alsa05.c     |  2 +-
 src/drivers/file.c       | 20 ++++++++++----------
 src/drivers/hpux.c       |  2 +-
 src/drivers/os2_dart.c   |  2 +-
 src/drivers/pulseaudio.c |  2 +-
 src/drivers/qnx.c        |  2 +-
 src/drivers/sgi.c        |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/drivers/aix.c b/src/drivers/aix.c
index 2e0d46a..496aff4 100644
--- a/src/drivers/aix.c
+++ b/src/drivers/aix.c
@@ -49,7 +49,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_bsd = {
+struct sound_driver sound_bsd = {
 	"aix",			/* driver ID */
 	"AIX PCM audio",	/* driver description */
 	help,			/* help */
diff --git a/src/drivers/alsa05.c b/src/drivers/alsa05.c
index 17381f2..a0c4dad 100644
--- a/src/drivers/alsa05.c
+++ b/src/drivers/alsa05.c
@@ -54,7 +54,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_alsa05 = {
+struct sound_driver sound_alsa05 = {
 	"alsa05",		/* driver ID */
 	"ALSA 0.5 PCM audio",	/* driver description */
 	help,			/* help */
diff --git a/src/drivers/file.c b/src/drivers/file.c
index bd5ac01..b081197 100644
--- a/src/drivers/file.c
+++ b/src/drivers/file.c
@@ -24,7 +24,7 @@
 #define O_BINARY 0
 #endif
 
-#define DATA(x) (((struct data *)drv_file.data)->x)
+#define DATA(x) (((struct data *)sound_file.data)->x)
 
 struct data {
 	int fd;
@@ -45,7 +45,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_file = {
+struct sound_driver sound_file = {
 	"file",			/* driver ID */
 	"file",			/* driver description */
 	help,			/* help */
@@ -63,8 +63,8 @@ static int init(struct context_data *ctx)
 	int bsize;
 	char *token, **parm;
 
-	drv_file.data = malloc(sizeof (struct data));
-	if (drv_file.data == NULL)
+	sound_file.data = malloc(sizeof (struct data));
+	if (sound_file.data == NULL)
 		return -1;
 
 	DATA(endian) = 0;
@@ -86,13 +86,13 @@ static int init(struct context_data *ctx)
 	}
 
 	if (strcmp(o->outfile, "-")) {
-		bsize = strlen(drv_file.description) + strlen(o->outfile) + 8;
+		bsize = strlen(sound_file.description) + strlen(o->outfile) + 8;
 		buf = malloc(bsize);
-		snprintf(buf, bsize, "%s: %s", drv_file.description,
+		snprintf(buf, bsize, "%s: %s", sound_file.description,
 							 o->outfile);
-		drv_file.description = buf;
+		sound_file.description = buf;
 	} else {
-		drv_file.description = strdup("Output to stdout");
+		sound_file.description = strdup("Output to stdout");
 	}
 
 	return 0;
@@ -122,6 +122,6 @@ static void shutdown(struct context_data *ctx)
 	if (DATA(fd) > 0)
 		close(DATA(fd));
 
-	free(drv_file.description);
-	free(drv_file.data);
+	free(sound_file.description);
+	free(sound_file.data);
 }
diff --git a/src/drivers/hpux.c b/src/drivers/hpux.c
index fb9164e..171a5a6 100644
--- a/src/drivers/hpux.c
+++ b/src/drivers/hpux.c
@@ -48,7 +48,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_hpux = {
+struct sound_driver sound_hpux = {
 	"hpux",			/* driver ID */
 	"HP-UX PCM audio",	/* driver description */
 	help,			/* help */
diff --git a/src/drivers/os2_dart.c b/src/drivers/os2_dart.c
index cf5bb39..cf4ed6d 100644
--- a/src/drivers/os2_dart.c
+++ b/src/drivers/os2_dart.c
@@ -64,7 +64,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_os2dart = {
+struct sound_driver sound_os2dart = {
 	"dart",			/* driver ID  */
 	"OS/2 Direct Audio Realtime",	/* driver description */
 	help,			/* help       */
diff --git a/src/drivers/pulseaudio.c b/src/drivers/pulseaudio.c
index 33f1ef5..20e2a90 100644
--- a/src/drivers/pulseaudio.c
+++ b/src/drivers/pulseaudio.c
@@ -29,7 +29,7 @@ static void dummy()
 {
 }
 
-struct xmp_drv_info drv_pulseaudio = {
+struct sound_driver sound_pulseaudio = {
 	"pulseaudio",		/* driver ID */
 	"PulseAudio",		/* driver description */
 	NULL,			/* help */
diff --git a/src/drivers/qnx.c b/src/drivers/qnx.c
index 8224472..ddb257c 100644
--- a/src/drivers/qnx.c
+++ b/src/drivers/qnx.c
@@ -37,7 +37,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_qnx = {
+struct sound_driver sound_qnx = {
 	"QNX",			/* driver ID */
 	"QNX PCM audio",	/* driver description */
 	NULL,			/* help */
diff --git a/src/drivers/sgi.c b/src/drivers/sgi.c
index 5c20026..58cf4a9 100644
--- a/src/drivers/sgi.c
+++ b/src/drivers/sgi.c
@@ -55,7 +55,7 @@ static char *help[] = {
 	NULL
 };
 
-struct xmp_drv_info drv_sgi = {
+struct sound_driver sound_sgi = {
 	"sgi",			/* driver ID */
 	"SGI PCM audio",	/* driver description */
 	help,			/* help */