added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / src / libgame / sound.h

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index cbafa9b7fb0b6c9d5b531a3d688221cc0e3ea75e..20852138ca194d9d34b35dd4fcf9a4bad8e28007 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // sound.h
 // ============================================================================
@@ -15,7 +15,7 @@
 #include "system.h"
 
 
-/* values for platform specific sound initialization */
+// values for platform specific sound initialization
 #define AUDIO_SAMPLE_RATE_22050                22050
 
 #define AUDIO_FRAGMENT_SIZE_512                512
@@ -35,7 +35,7 @@
 
 #define DEFAULT_AUDIO_SAMPLE_RATE      AUDIO_SAMPLE_RATE_22050
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define DEFAULT_AUDIO_FRAGMENT_SIZE    AUDIO_FRAGMENT_SIZE_1024
 #else
 #define DEFAULT_AUDIO_FRAGMENT_SIZE    AUDIO_FRAGMENT_SIZE_512
@@ -47,7 +47,7 @@
 #define FIRST_SOUND_CHANNEL            1
 
 
-/* values for PlaySound(), StopSound() and friends */
+// values for PlaySound(), StopSound() and friends
 #define SND_CTRL_NONE                  (0)
 #define SND_CTRL_MUSIC                 (1 << 0)
 #define SND_CTRL_LOOP                  (1 << 1)
@@ -93,15 +93,15 @@
 #define SOUND_MIDDLE                   (SOUND_MAX_LEFT2RIGHT / 2)
 
 
-/* general sound functions */
+// general sound functions
 void UnixOpenAudio(void);
 void UnixCloseAudio(void);
 
-/* mixer functions */ 
+// mixer functions
 void Mixer_InitChannels(void);
 void StartMixer(void);
 
-/* sound client functions */
+// sound client functions
 void PlayMusic(int);
 void PlayMusicLoop(int);
 void PlaySound(int);
@@ -122,8 +122,10 @@ void ExpireSoundLoops(boolean);
 
 int getSoundListSize(void);
 int getMusicListSize(void);
+int getMusicListSize_NoConf(void);
 struct FileInfo *getSoundListEntry(int);
 struct FileInfo *getMusicListEntry(int);
+char *getSoundInfoEntryFilename(int);
 char *getMusicInfoEntryFilename(int);
 char *getCurrentlyPlayingMusicFilename(void);
 int getSoundListPropertyMappingSize(void);
@@ -134,8 +136,8 @@ void InitSoundList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
                   char **, char **, char **, char **, char **);
 void InitMusicList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
                   char **, char **, char **, char **, char **);
-void InitReloadCustomSounds(char *);
-void InitReloadCustomMusic(char *);
+void InitReloadCustomSounds(void);
+void InitReloadCustomMusic(void);
 void FreeAllSounds(void);
 void FreeAllMusic(void);