--- np2/x11/soundmng.c	2011/01/15 16:01:52	1.14
+++ np2/x11/soundmng.c	2011/12/24 16:57:46	1.17
@@ -1,5 +1,3 @@
-/*	$Id: soundmng.c,v 1.14 2011/01/15 16:01:52 monaka Exp $	*/
-
 /*
  * Copyright (c) 2001-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -70,13 +68,13 @@ MIDIMOD vermouth_module = NULL;
  * driver
  */
 static struct {
-        BOOL (*drvinit)(UINT rate, UINT samples);
-        BOOL (*drvterm)(void);
+	BOOL (*drvinit)(UINT rate, UINT samples);
+	BOOL (*drvterm)(void);
 	void (*drvlock)(void);
 	void (*drvunlock)(void);
 
-        void (*sndplay)(void);
-        void (*sndstop)(void);
+	void (*sndplay)(void);
+	void (*sndstop)(void);
 
 	void *(*pcmload)(UINT num, const char *path);
 	void (*pcmdestroy)(void *chanp, UINT num);
@@ -340,7 +338,7 @@ soundmng_setreverse(BOOL reverse)
 /*
  * PCM function
  */
-void
+static void
 soundmng_pcminit(void)
 {
 	int i;
@@ -350,7 +348,7 @@ soundmng_pcminit(void)
 	}
 }
 
-void
+static void
 soundmng_pcmdestroy(void)
 {
 	int i;
@@ -421,7 +419,7 @@ buffer_init(void)
 		}
 		sound_buffer[i] = (char *)_MALLOC(opna_frame, "sound buffer");
 		if (sound_buffer[i] == NULL) {
-			fprintf(stderr, "buffer_init: can't alloc memory\n");
+			g_printerr("buffer_init: can't alloc memory\n");
 			sounddrv_unlock();
 			return FAILURE;
 		}
@@ -787,13 +785,15 @@ sdlaudio_init(UINT rate, UINT samples)
 
 	rv = SDL_InitSubSystem(SDL_INIT_AUDIO);
 	if (rv < 0) {
-		fprintf(stderr, "sdlaudio_init: SDL_InitSubSystem\n");
+		g_printerr("sdlmixer_init: SDL_InitSubSystem(): %s\n",
+		    SDL_GetError());
 		return FAILURE;
 	}
 
 	audio_fd = SDL_OpenAudio(&fmt, NULL);
 	if (audio_fd < 0) {
-		fprintf(stderr, "sdlaudio_init: SDL_OpenAudio\n");
+		g_printerr("sdlaudio_init: SDL_OpenAudio(): %s\n",
+		    SDL_GetError());
 		SDL_QuitSubSystem(SDL_INIT_AUDIO);
 		return FAILURE;
 	}
@@ -841,21 +841,21 @@ sdlmixer_init(UINT rate, UINT samples)
 
 	rv = SDL_InitSubSystem(SDL_INIT_AUDIO);
 	if (rv < 0) {
-		fprintf(stderr, "sdlmixer_init: SDL_InitSubSystem(): %s\n",
+		g_printerr("sdlmixer_init: SDL_InitSubSystem(): %s\n",
 		    SDL_GetError());
 		goto failure;
 	}
 
 	rv = Mix_OpenAudio(rate, AUDIO_S16SYS, 2, samples);
 	if (rv < 0) {
-		fprintf(stderr, "sdlmixer_init: Mix_OpenAudio(): %s\n",
+		g_printerr("sdlmixer_init: Mix_OpenAudio(): %s\n",
 		    Mix_GetError());
 		goto failure1;
 	}
 
 	rv = Mix_AllocateChannels(SOUND_MAXPCM);
 	if (rv < 0) {
-		fprintf(stderr, "sdlmixer_init: Mix_AllocateChannels(): %s\n",
+		g_printerr("sdlmixer_init: Mix_AllocateChannels(): %s\n",
 		    Mix_GetError());
 		goto failure1;
 	}