X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=deb4e38ecfe69cf014a2daf38e8e11e70797fc1d;hb=fe57866d9aa0cc2ebf48411eaf7bb4180cf85a84;hp=26e882b3e177c5345b97c8a3670046463dd83c9e;hpb=4239ba2adc93afb81230b1a4ea42e7eaf68452c6;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 26e882b3..deb4e38e 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/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
@@ -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)
@@ -60,7 +60,8 @@
 
 #define SND_CTRL_PLAY_SOUND		(SND_CTRL_NONE)
 #define SND_CTRL_PLAY_LOOP		(SND_CTRL_LOOP)
-#define SND_CTRL_PLAY_MUSIC		(SND_CTRL_LOOP | SND_CTRL_MUSIC)
+#define SND_CTRL_PLAY_MUSIC		(SND_CTRL_MUSIC)
+#define SND_CTRL_PLAY_MUSIC_LOOP	(SND_CTRL_MUSIC | SND_CTRL_LOOP)
 
 #define SND_CTRL_FADE_SOUND		(SND_CTRL_FADE)
 #define SND_CTRL_FADE_MUSIC		(SND_CTRL_FADE | SND_CTRL_MUSIC)
@@ -92,20 +93,22 @@
 #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);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);
 void PlaySoundMusic(int);
+void PlaySoundMusicLoop(int);
 void PlaySoundExt(int, int, int, int);
 void FadeMusic(void);
 void FadeSound(int);
@@ -117,14 +120,16 @@ void StopSounds(void);
 void StopSoundExt(int, int);
 void ExpireSoundLoops(boolean);
 
-int getSoundListSize();
-int getMusicListSize();
+int getSoundListSize(void);
+int getMusicListSize(void);
 struct FileInfo *getSoundListEntry(int);
 struct FileInfo *getMusicListEntry(int);
-int getSoundListPropertyMappingSize();
-int getMusicListPropertyMappingSize();
-struct PropertyMapping *getSoundListPropertyMapping();
-struct PropertyMapping *getMusicListPropertyMapping();
+char *getMusicInfoEntryFilename(int);
+char *getCurrentlyPlayingMusicFilename(void);
+int getSoundListPropertyMappingSize(void);
+int getMusicListPropertyMappingSize(void);
+struct PropertyMapping *getSoundListPropertyMapping(void);
+struct PropertyMapping *getMusicListPropertyMapping(void);
 void InitSoundList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
 		   char **, char **, char **, char **, char **);
 void InitMusicList(struct ConfigInfo *, int, struct ConfigTypeInfo *,