-#endif
-
-#if 0
-#define PSND_NO_LOOP 0
-#define PSND_LOOP 1
-#define PSND_MUSIC 2
-
-#define SSND_FADE_SOUND (1 << 0)
-#define SSND_FADE_MUSIC (1 << 1)
-#define SSND_FADE_ALL (1 << 2)
-#define SSND_FADING (SSND_FADE_SOUND | \
- SSND_FADE_MUSIC | \
- SSND_FADE_ALL)
-#define SSND_STOP_SOUND (1 << 3)
-#define SSND_STOP_MUSIC (1 << 4)
-#define SSND_STOP_ALL (1 << 5)
-#define SSND_STOPPING (SSND_STOP_SOUND | \
- SSND_STOP_MUSIC | \
- SSND_STOP_ALL)
-#define SSND_MUSIC (SSND_FADE_MUSIC | SSND_STOP_MUSIC)
-#define SSND_ALL (SSND_FADE_ALL | SSND_STOP_ALL)
-
-#define SND_RELOAD_SOUNDS 1
-#define SND_RELOAD_MUSIC 2
-#endif
-
-#define SND_TYPE_NONE 0
-#define SND_TYPE_WAV 1
-
-#define MUS_TYPE_NONE 0
-#define MUS_TYPE_WAV 1
-#define MUS_TYPE_MOD 2
-
-/* settings for sound path, sound device, etc. */
-#ifndef SND_PATH
-#define SND_PATH "./sounds"
-#endif
-
-#define DEVICENAME_DSP "/dev/dsp"
-#define DEVICENAME_AUDIO "/dev/audio"
-#define DEVICENAME_AUDIOCTL "/dev/audioCtl"
-
-#if 0
-#if defined(AUDIO_STREAMING_DSP)
-#define AUDIO_DEVICE DEVICENAME_DSP
-#else
-#define AUDIO_DEVICE DEVICENAME_AUDIO
-#endif
-#endif
+/* values for PlaySound(), StopSound() and friends */
+#define SND_CTRL_NONE (0)
+#define SND_CTRL_MUSIC (1 << 0)
+#define SND_CTRL_LOOP (1 << 1)
+#define SND_CTRL_FADE (1 << 2)
+#define SND_CTRL_STOP (1 << 3)
+#define SND_CTRL_ALL_SOUNDS (1 << 4)
+#define SND_CTRL_RELOAD_SOUNDS (1 << 5)
+#define SND_CTRL_RELOAD_MUSIC (1 << 6)
+#define SND_CTRL_EXPIRE_LOOPS (1 << 7)