projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cleanup (using new and already existing structures)
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index c9a74eb1b262056ec279873861f8511148f074a4..9d894b3c283530171b1223ba1b4df2ad81a068f0 100644
(file)
--- a/
src/libgame/sound.c
+++ b/
src/libgame/sound.c
@@
-126,11
+126,11
@@
static struct SoundControl mixer[NUM_MIXER_CHANNELS];
static int mixer_active_channels = 0;
static boolean expire_loop_sounds = FALSE;
static int mixer_active_channels = 0;
static boolean expire_loop_sounds = FALSE;
-static void ReloadCustomSounds();
-static void ReloadCustomMusic();
+static void ReloadCustomSounds(
void
);
+static void ReloadCustomMusic(
void
);
static void FreeSound(void *);
static void FreeMusic(void *);
static void FreeSound(void *);
static void FreeMusic(void *);
-static void FreeAllMusic_NoConf();
+static void FreeAllMusic_NoConf(
void
);
static SoundInfo *getSoundInfoEntryFromSoundID(int);
static MusicInfo *getMusicInfoEntryFromMusicID(int);
static SoundInfo *getSoundInfoEntryFromSoundID(int);
static MusicInfo *getMusicInfoEntryFromMusicID(int);
@@
-140,7
+140,7
@@
static MusicInfo *getMusicInfoEntryFromMusicID(int);
/* mixer functions */
/* ------------------------------------------------------------------------- */
/* mixer functions */
/* ------------------------------------------------------------------------- */
-void Mixer_InitChannels()
+void Mixer_InitChannels(
void
)
{
int i;
{
int i;
@@
-215,7
+215,7
@@
static void Mixer_PlayChannel(int channel)
mixer_active_channels++;
}
mixer_active_channels++;
}
-static void Mixer_PlayMusicChannel()
+static void Mixer_PlayMusicChannel(
void
)
{
Mixer_PlayChannel(audio.music_channel);
{
Mixer_PlayChannel(audio.music_channel);
@@
-251,7
+251,7
@@
static void Mixer_StopChannel(int channel)
mixer_active_channels--;
}
mixer_active_channels--;
}
-static void Mixer_StopMusicChannel()
+static void Mixer_StopMusicChannel(
void
)
{
Mixer_StopChannel(audio.music_channel);
{
Mixer_StopChannel(audio.music_channel);
@@
-270,7
+270,7
@@
static void Mixer_FadeChannel(int channel)
Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
}
Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
}
-static void Mixer_FadeMusicChannel()
+static void Mixer_FadeMusicChannel(
void
)
{
Mixer_FadeChannel(audio.music_channel);
{
Mixer_FadeChannel(audio.music_channel);
@@
-578,7
+578,7
@@
static void *Load_WAV_or_MOD(char *filename)
return NULL;
}
return NULL;
}
-void LoadCustomMusic_NoConf(void)
+
static
void LoadCustomMusic_NoConf(void)
{
static boolean draw_init_text = TRUE; /* only draw at startup */
static char *last_music_directory = NULL;
{
static boolean draw_init_text = TRUE; /* only draw at startup */
static char *last_music_directory = NULL;
@@
-654,13
+654,13
@@
void LoadCustomMusic_NoConf(void)
draw_init_text = FALSE;
}
draw_init_text = FALSE;
}
-int getSoundListSize()
+int getSoundListSize(
void
)
{
return (sound_info->num_file_list_entries +
sound_info->num_dynamic_file_list_entries);
}
{
return (sound_info->num_file_list_entries +
sound_info->num_dynamic_file_list_entries);
}
-int getMusicListSize()
+int getMusicListSize(
void
)
{
return (music_info->num_file_list_entries +
music_info->num_dynamic_file_list_entries);
{
return (music_info->num_file_list_entries +
music_info->num_dynamic_file_list_entries);
@@
-742,27
+742,27
@@
char *getMusicInfoEntryFilename(int pos)
return getBaseNamePtr(mus_info->source_filename);
}
return getBaseNamePtr(mus_info->source_filename);
}
-char *getCurrentlyPlayingMusicFilename()
+char *getCurrentlyPlayingMusicFilename(
void
)
{
return currently_playing_music_filename;
}
{
return currently_playing_music_filename;
}
-int getSoundListPropertyMappingSize()
+int getSoundListPropertyMappingSize(
void
)
{
return sound_info->num_property_mapping_entries;
}
{
return sound_info->num_property_mapping_entries;
}
-int getMusicListPropertyMappingSize()
+int getMusicListPropertyMappingSize(
void
)
{
return music_info->num_property_mapping_entries;
}
{
return music_info->num_property_mapping_entries;
}
-struct PropertyMapping *getSoundListPropertyMapping()
+struct PropertyMapping *getSoundListPropertyMapping(
void
)
{
return sound_info->property_mapping;
}
{
return sound_info->property_mapping;
}
-struct PropertyMapping *getMusicListPropertyMapping()
+struct PropertyMapping *getMusicListPropertyMapping(
void
)
{
return music_info->property_mapping;
}
{
return music_info->property_mapping;
}
@@
-1018,12
+1018,12
@@
void FadeSound(int nr)
StopSoundExt(nr, SND_CTRL_FADE_SOUND);
}
StopSoundExt(nr, SND_CTRL_FADE_SOUND);
}
-void FadeSounds()
+void FadeSounds(
void
)
{
StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
{
StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
-void FadeSoundsAndMusic()
+void FadeSoundsAndMusic(
void
)
{
FadeSounds();
FadeMusic();
{
FadeSounds();
FadeMusic();
@@
-1042,7
+1042,7
@@
void StopSound(int nr)
StopSoundExt(nr, SND_CTRL_STOP_SOUND);
}
StopSoundExt(nr, SND_CTRL_STOP_SOUND);
}
-void StopSounds()
+void StopSounds(
void
)
{
StopMusic();
StopSoundExt(-1, SND_CTRL_STOP_ALL);
{
StopMusic();
StopSoundExt(-1, SND_CTRL_STOP_ALL);
@@
-1079,13
+1079,13
@@
void ExpireSoundLoops(boolean active)
HandleSoundRequest(snd_ctrl);
}
HandleSoundRequest(snd_ctrl);
}
-static void ReloadCustomSounds()
+static void ReloadCustomSounds(
void
)
{
LoadArtworkConfig(sound_info);
ReloadCustomArtworkList(sound_info);
}
{
LoadArtworkConfig(sound_info);
ReloadCustomArtworkList(sound_info);
}
-static void ReloadCustomMusic()
+static void ReloadCustomMusic(
void
)
{
LoadArtworkConfig(music_info);
ReloadCustomArtworkList(music_info);
{
LoadArtworkConfig(music_info);
ReloadCustomArtworkList(music_info);
@@
-1145,7
+1145,7
@@
void FreeMusic(void *ptr)
free(music);
}
free(music);
}
-static void FreeAllMusic_NoConf()
+static void FreeAllMusic_NoConf(
void
)
{
int i;
{
int i;
@@
-1161,12
+1161,12
@@
static void FreeAllMusic_NoConf()
num_music_noconf = 0;
}
num_music_noconf = 0;
}
-void FreeAllSounds()
+void FreeAllSounds(
void
)
{
FreeCustomArtworkLists(sound_info);
}
{
FreeCustomArtworkLists(sound_info);
}
-void FreeAllMusic()
+void FreeAllMusic(
void
)
{
FreeCustomArtworkLists(music_info);
FreeAllMusic_NoConf();
{
FreeCustomArtworkLists(music_info);
FreeAllMusic_NoConf();