1 files changed, 126 insertions, 24 deletions

diff --git a/apps/plugins/mikmod/mmerror.c b/apps/plugins/mikmod/mmerror.c
index ed7c66a10f..4d7949890e 100644
--- a/apps/plugins/mikmod/mmerror.c
+++ b/apps/plugins/mikmod/mmerror.c
@@ -6,12 +6,12 @@
         it under the terms of the GNU Library General Public License as
         published by the Free Software Foundation; either version 2 of
         the License, or (at your option) any later version.
- 
+
         This program is distributed in the hope that it will be useful,
         but WITHOUT ANY WARRANTY; without even the implied warranty of
         MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
         GNU Library General Public License for more details.
- 
+
         You should have received a copy of the GNU Library General Public
         License along with this library; if not, write to the Free Software
         Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -20,7 +20,7 @@
 
 /*==============================================================================
 
-  $Id: mmerror.c,v 1.2 2005/03/30 19:10:41 realtech Exp $
+  $Id$
 
   Error handling functions.
   Register an error handler with _mm_RegisterErrorHandler() and you're all set.
@@ -40,7 +40,9 @@
 
 #include "mikmod_internals.h"
 
-CHAR *_mm_errmsg[MMERR_MAX+1] =
+#define _mmerr_invalid "Invalid error code"
+
+static const char *_mm_errmsg[MMERR_MAX+1] =
 {
 /* No error */
 
@@ -82,62 +84,89 @@ CHAR *_mm_errmsg[MMERR_MAX+1] =
         "Unable to set non-blocking mode for audio device",
 
 /* AudioFile driver errors  */
-
+#ifdef DRV_AF
         "Cannot find suitable AudioFile audio port",
+#else
+        _mmerr_invalid,
+#endif
 
 /* AIX driver errors */
-
+#ifdef DRV_AIX
         "Configuration (init step) of audio device failed",
         "Configuration (control step) of audio device failed",
         "Configuration (start step) of audio device failed",
-
-/* ALSA driver errors */
-
-/* EsounD driver errors */
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* Ultrasound driver errors */
-
+#ifdef DRV_ULTRA
         "Ultrasound driver only works in 16 bit stereo 44 KHz",
         "Ultrasound card could not be reset",
         "Could not start Ultrasound timer",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* HP driver errors  */
-
+#ifdef DRV_HP
         "Unable to select 16bit-linear sample format",
         "Could not select requested sample-rate",
         "Could not select requested number of channels",
         "Unable to select audio output",
         "Unable to get audio description",
         "Could not set transmission buffer size",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* Open Sound System driver errors */
-
+#ifdef DRV_OSS
         "Could not set fragment size",
         "Could not set sample size",
         "Could not set mono/stereo setting",
         "Could not set sample rate",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid,
+#endif
 
 /* SGI driver errors */
-
+#ifdef DRV_SGI
         "Unsupported sample rate",
         "Hardware does not support 16 bit sound",
         "Hardware does not support 8 bit sound",
         "Hardware does not support stereo sound",
         "Hardware does not support mono sound",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* Sun driver errors */
-
+#ifdef DRV_SUN
         "Sound device initialization failed",
+#else
+        _mmerr_invalid,
+#endif
 
 /* OS/2 drivers errors */
-
+#if defined(DRV_OS2) || defined(DRV_DART)
         "Could not set mixing parameters",
+#else
+        _mmerr_invalid,
+#endif
+#ifdef DRV_OS2
         "Could not create playback semaphores",
         "Could not create playback timer",
         "Could not create playback thread",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* DirectSound driver errors */
-
+#ifdef DRV_DS
         "Could not set playback priority",
         "Could not create playback buffers",
         "Could not set playback format",
@@ -145,22 +174,34 @@ CHAR *_mm_errmsg[MMERR_MAX+1] =
         "Could not register event",
         "Could not create playback thread",
         "Could not initialize playback thread",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid,
+#endif
 
 /* Windows Multimedia API driver errors */
-
+#ifdef DRV_WIN
         "Invalid device handle",
         "The resource is already allocated",
         "Invalid device identifier",
         "Unsupported output format",
         "Unknown error",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* Macintosh driver errors */
-
+#ifdef DRV_MAC
         "Unsupported sample rate",
         "Could not start playback",
+#else
+        _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* MacOS X/Darwin driver errors */
-
+#ifdef DRV_OSX
         "Unknown device",
         "Bad property",
         "Could not set playback format",
@@ -169,20 +210,81 @@ CHAR *_mm_errmsg[MMERR_MAX+1] =
         "Could not create playback thread",
         "Could not start audio device",
         "Could not create buffer thread",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* DOS driver errors */
-
+#ifdef DRV_WSS
         "WSS_STARTDMA",
+#else
+        _mmerr_invalid,
+#endif
+#ifdef DRV_SB
         "SB_STARTDMA",
+#else
+        _mmerr_invalid,
+#endif
+
+/* float32 output */
+
+        "This driver doesn't support 32 bit float output",
+
+/* OpenAL driver errors */
+#ifdef DRV_OPENAL
+        "Could not create context",
+        "Could not make context current",
+        "Could not create buffers",
+        "Could not create sources",
+        "Could not change source parameters",
+        "Could not queue buffers",
+        "Could not unqueue buffers",
+        "Could not copy buffer data",
+        "Could not get source parameters",
+        "Could not play source",
+        "Could not stop source",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid,
+#endif
+
+/* ALSA driver errors */
+#ifdef DRV_ALSA
+        "No ALSA configurations available",
+        "Could not set ALSA output params",
+        "Could not set playback format",
+        "Could not set sample rate",
+        "Could not set mono/stereo setting",
+        "Could not get buffer size from ALSA",
+        "ALSA PCM start error",
+        "ALSA PCM write error",
+        "ALSA PCM recovery failure",
+#else
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+        _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,
+#endif
+
+/* Sndio errors */
+#ifdef DRV_SNDIO
+        "Could not set SNDIO output params",
+        "Unsupported SNDIO output params",
+#else
+        _mmerr_invalid, _mmerr_invalid,
+#endif
 
 /* Invalid error */
 
-        "Invalid error code"
+        _mmerr_invalid
 };
 
-MIKMODAPI char *MikMod_strerror(int code)
+MIKMODAPI const char *MikMod_strerror(int code)
 {
-        if ((code<0)||(code>MMERR_MAX)) code=MMERR_MAX+1;
+        if ((code<0)||(code>MMERR_MAX)) code=MMERR_MAX;
         return _mm_errmsg[code];
 }