/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment *
+* (c) 1994-2002 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* sound.c *
***********************************************************/
-#include <string.h>
+#include <sys/types.h>
#include <sys/time.h>
+#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
#define MUS_TYPE_MOD 2
#define DEVICENAME_DSP "/dev/dsp"
+#define DEVICENAME_SOUND_DSP "/dev/sound/dsp"
#define DEVICENAME_AUDIO "/dev/audio"
#define DEVICENAME_AUDIOCTL "/dev/audioCtl"
#define SOUND_VOLUME_LEFT(x) (stereo_volume[x])
#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x])
+#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
+#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
#if 0
struct SoundHeader_SUN
};
#endif
+#if defined(AUDIO_UNIX_NATIVE)
+struct SoundHeader_WAV
+{
+ unsigned short compression_code;
+ unsigned short num_channels;
+ unsigned long sample_rate;
+ unsigned long bytes_per_second;
+ unsigned short block_align;
+ unsigned short bits_per_sample;
+};
+#endif
+
struct AudioFormatInfo
{
boolean stereo; /* availability of stereo sound */
int type;
int format;
- long data_len;
- void *data_ptr;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ long data_len; /* number of samples, NOT number of bytes */
};
typedef struct SampleInfo SoundInfo;
typedef struct SampleInfo MusicInfo;
int type;
int format;
- long data_len;
- void *data_ptr;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ long data_len; /* number of samples, NOT number of bytes */
#if defined(TARGET_ALLEGRO)
int voice;
static char *audio_device_name[] =
{
DEVICENAME_DSP,
+ DEVICENAME_SOUND_DSP,
DEVICENAME_AUDIO
};
int audio_device_fd = -1;
return FALSE;
}
+#if 0
+ printf("PID: %d [%s]\n", getpid(),
+ (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent"));
+ Delay(10000 * 0);
+#endif
+
if (IS_CHILD_PROCESS(audio.mixer_pid))
Mixer_Main(); /* this function never returns */
else
if (ioctl(audio.device_fd, SNDCTL_DSP_SETFRAGMENT, &fragment_spec) < 0)
Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp -- no sounds");
+ "cannot set fragment size of audio device -- no sounds");
i = 0;
afmt->format = 0;
if (afmt->format == 0) /* no supported audio format found */
Error(ERR_EXIT_SOUND_SERVER,
- "cannot set audio format of /dev/dsp -- no sounds");
+ "cannot set audio format of audio device -- no sounds");
/* try if we can use stereo sound */
afmt->stereo = TRUE;
if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0)
Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/dsp -- no sounds");
+ "cannot set sample rate of audio device -- no sounds");
/* get the real fragmentation size; this should return 512 */
if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0)
Error(ERR_EXIT_SOUND_SERVER,
- "cannot get fragment size of /dev/dsp -- no sounds");
+ "cannot get fragment size of audio device -- no sounds");
if (fragment_size_query != afmt->fragment_size)
Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp -- no sounds");
+ "cannot set fragment size of audio device -- no sounds");
}
#endif /* AUDIO_LINUX_IOCTL */
a_info.play.encoding = AUDIO_ENCODING_LINEAR8;
a_info.play.precision = 8;
a_info.play.channels = 2;
- a_info.play.sample_rate = sample_rate;
- a_info.blocksize = fragment_size;
+ a_info.play.sample_rate = afmt->sample_rate;
+ a_info.blocksize = afmt->fragment_size;
afmt->format = AUDIO_FORMAT_U8;
afmt->stereo = TRUE;
if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/audio -- no sounds");
+ "cannot set sample rate of audio device -- no sounds");
}
}
#endif /* PLATFORM_NETBSD */
audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
if (audio_ctl == -1)
- Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds");
+ Error(ERR_EXIT_SOUND_SERVER, "cannot open audio device -- no sounds");
if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
}
-static void WriteReloadInfoToPipe(char *set_name, int type)
+static void WriteReloadInfoToPipe(char *set_identifier, int type)
{
SoundControl snd_ctrl;
TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
artwork.mus_current);
unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
- unsigned long str_size2 = strlen(ti->basepath) + 1;
- unsigned long str_size3 = strlen(ti->fullpath) + 1;
+ unsigned long str_size2 = strlen(leveldir_current->sounds_path) + 1;
+ unsigned long str_size3 = strlen(leveldir_current->music_path) + 1;
+ unsigned long str_size4 = strlen(ti->basepath) + 1;
+ unsigned long str_size5 = strlen(ti->fullpath) + 1;
+ boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ?
+ setup.override_level_sounds :
+ setup.override_level_music);
if (IS_CHILD_PROCESS(audio.mixer_pid))
return;
snd_ctrl.active = FALSE;
snd_ctrl.state = type;
- snd_ctrl.data_len = strlen(set_name) + 1;
+ snd_ctrl.data_len = strlen(set_identifier) + 1;
if (write(audio.mixer_pipe[1], &snd_ctrl,
sizeof(snd_ctrl)) < 0 ||
- write(audio.mixer_pipe[1], set_name,
+ write(audio.mixer_pipe[1], set_identifier,
snd_ctrl.data_len) < 0 ||
+ write(audio.mixer_pipe[1], &override_level_artwork,
+ sizeof(boolean)) < 0 ||
write(audio.mixer_pipe[1], leveldir_current,
sizeof(TreeInfo)) < 0 ||
write(audio.mixer_pipe[1], ti,
sizeof(unsigned long)) < 0 ||
write(audio.mixer_pipe[1], &str_size3,
sizeof(unsigned long)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size4,
+ sizeof(unsigned long)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size5,
+ sizeof(unsigned long)) < 0 ||
write(audio.mixer_pipe[1], leveldir_current->fullpath,
str_size1) < 0 ||
- write(audio.mixer_pipe[1], ti->basepath,
+ write(audio.mixer_pipe[1], leveldir_current->sounds_path,
str_size2) < 0 ||
+ write(audio.mixer_pipe[1], leveldir_current->music_path,
+ str_size3) < 0 ||
+ write(audio.mixer_pipe[1], ti->basepath,
+ str_size4) < 0 ||
write(audio.mixer_pipe[1], ti->fullpath,
- str_size3) < 0)
+ str_size5) < 0)
{
Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ?
&artwork.snd_current : &artwork.mus_current);
TreeInfo *ti = *ti_ptr;
- unsigned long str_size1, str_size2, str_size3;
- static char *set_name = NULL;
+ unsigned long str_size1, str_size2, str_size3, str_size4, str_size5;
+ static char *set_identifier = NULL;
+ boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ?
+ &setup.override_level_sounds :
+ &setup.override_level_music);
- if (set_name)
- free(set_name);
+ if (set_identifier)
+ free(set_identifier);
- set_name = checked_malloc(snd_ctrl->data_len);
+ set_identifier = checked_malloc(snd_ctrl->data_len);
if (leveldir_current == NULL)
leveldir_current = checked_calloc(sizeof(TreeInfo));
+
if (ti == NULL)
ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
if (leveldir_current->fullpath != NULL)
free(leveldir_current->fullpath);
+ if (leveldir_current->sounds_path != NULL)
+ free(leveldir_current->sounds_path);
+ if (leveldir_current->music_path != NULL)
+ free(leveldir_current->music_path);
if (ti->basepath != NULL)
free(ti->basepath);
if (ti->fullpath != NULL)
free(ti->fullpath);
- if (read(audio.mixer_pipe[0], set_name,
+ if (read(audio.mixer_pipe[0], set_identifier,
snd_ctrl->data_len) != snd_ctrl->data_len ||
+ read(audio.mixer_pipe[0], override_level_artwork,
+ sizeof(boolean)) != sizeof(boolean) ||
read(audio.mixer_pipe[0], leveldir_current,
sizeof(TreeInfo)) != sizeof(TreeInfo) ||
read(audio.mixer_pipe[0], ti,
read(audio.mixer_pipe[0], &str_size2,
sizeof(unsigned long)) != sizeof(unsigned long) ||
read(audio.mixer_pipe[0], &str_size3,
+ sizeof(unsigned long)) != sizeof(unsigned long) ||
+ read(audio.mixer_pipe[0], &str_size4,
+ sizeof(unsigned long)) != sizeof(unsigned long) ||
+ read(audio.mixer_pipe[0], &str_size5,
sizeof(unsigned long)) != sizeof(unsigned long))
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
leveldir_current->fullpath = checked_calloc(str_size1);
- ti->basepath = checked_calloc(str_size2);
- ti->fullpath = checked_calloc(str_size3);
+ leveldir_current->sounds_path = checked_calloc(str_size2);
+ leveldir_current->music_path = checked_calloc(str_size3);
+ ti->basepath = checked_calloc(str_size4);
+ ti->fullpath = checked_calloc(str_size5);
if (read(audio.mixer_pipe[0], leveldir_current->fullpath,
str_size1) != str_size1 ||
- read(audio.mixer_pipe[0], ti->basepath,
+ read(audio.mixer_pipe[0], leveldir_current->sounds_path,
str_size2) != str_size2 ||
+ read(audio.mixer_pipe[0], leveldir_current->music_path,
+ str_size3) != str_size3 ||
+ read(audio.mixer_pipe[0], ti->basepath,
+ str_size4) != str_size4 ||
read(audio.mixer_pipe[0], ti->fullpath,
- str_size3) != str_size3)
+ str_size5) != str_size5)
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS)
- artwork.sounds_set_current = set_name;
+ artwork.snd_current_identifier = set_identifier;
else
- artwork.music_set_current = set_name;
+ artwork.mus_current_identifier = set_identifier;
}
#endif /* AUDIO_UNIX_NATIVE */
int i, k;
#if 0
- printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
-#endif
-
-#if 0
- printf("%d ACTIVE CHANNELS\n", mixer_active_channels);
+ printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n",
+ snd_ctrl.nr, num_sounds, mixer_active_channels);
#endif
if (IS_MUSIC(snd_ctrl))
+ {
+ if (num_music == 0)
+ return;
+
snd_ctrl.nr = snd_ctrl.nr % num_music;
+ }
else if (snd_ctrl.nr >= num_sounds)
return;
/* play music samples on a dedicated music channel */
if (IS_MUSIC(snd_ctrl))
{
-#if 0
- printf("PLAY MUSIC WITH VOLUME/STEREO %d/%d\n",
- snd_ctrl.volume, snd_ctrl.stereo_position);
-#endif
+ Mixer_StopMusicChannel();
mixer[audio.music_channel] = snd_ctrl;
Mixer_PlayMusicChannel();
return;
}
- /* check if sound is already being played (and how often) */
+ /* check if (and how often) this sound sample is already playing */
for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].active && mixer[i].nr == snd_ctrl.nr)
+ if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
k++;
#if 0
{
for(i=audio.first_sound_channel; i<audio.num_channels; i++)
{
- if (mixer[i].active && mixer[i].nr == snd_ctrl.nr)
+ if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
{
#if 0
printf("RESETTING EXPIRATION FOR SOUND %d\n", snd_ctrl.nr);
return;
}
+#if 0
+ printf("PLAYING NEW SOUND %d\n", snd_ctrl.nr);
+#endif
+
/* don't play sound more than n times simultaneously (with n == 2 for now) */
if (k >= 2)
{
int playing_time = playing_current - mixer[i].playing_starttime;
int actual;
- if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr)
+ if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl))
continue;
actual = 1000 * playing_time / mixer[i].data_len;
of the channel's sound sample when compiling with the SDL mixer
library, we use the current playing time (in milliseconds) instead. */
+#if DEBUG
+ /* channel allocation sanity check -- should not be needed */
+ if (mixer_active_channels ==
+ audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
+ {
+ for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ {
+ if (!mixer[i].active)
+ {
+ Error(ERR_RETURN, "Mixer_InsertSound: Channel %d inactive", i);
+ Error(ERR_RETURN, "Mixer_InsertSound: This should never happen!");
+
+ mixer_active_channels--;
+ }
+ }
+ }
+#endif
+
if (mixer_active_channels ==
audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
unsigned long playing_current = Counter();
int longest = 0, longest_nr = audio.first_sound_channel;
+ for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ {
+ Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
+ i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr);
+ }
+
for (i=audio.first_sound_channel; i<audio.num_channels; i++)
{
int playing_time = playing_current - mixer[i].playing_starttime;
}
/* add the new sound to the mixer */
- for(i=
0; i<audio.num_channels; i++)
+ for(i=
audio.first_sound_channel; i<audio.num_channels; i++)
{
#if 0
printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
#endif
- /*
- if (!mixer[i].active ||
- (IS_MUSIC(snd_ctrl) && i == audio.music_channel))
- */
- if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) ||
- (i != audio.music_channel && !mixer[i].active))
+ if (!mixer[i].active)
{
#if 0
printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr);
#endif
-#if 1
#if defined(AUDIO_UNIX_NATIVE)
if (snd_info->data_len == 0)
{
printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
}
#endif
-#endif
-
-#if 1
- if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active)
- {
- printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
-
-#if 1
- Mixer_StopChannel(i);
-#endif
- }
-#endif
mixer[i] = snd_ctrl;
Mixer_PlayChannel(i);
}
for(i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_FadeChannel(i);
}
else if (IS_STOPPING(snd_ctrl)) /* stop existing sound or music */
}
for(i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_StopChannel(i);
#if defined(AUDIO_UNIX_NATIVE)
mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
/* might be needed for u-law /dev/audio */
-#if 0
+#if 1
for(j=0; j<sample_size; j++)
playing_buffer[j] =
linear_to_ulaw(premix_first_buffer[j]);
{
SoundInfo *snd_info;
#if defined(AUDIO_UNIX_NATIVE)
+ struct SoundHeader_WAV header;
+#if 0
byte sound_header_buffer[WAV_HEADER_SIZE];
+ int i;
+#endif
char chunk_name[CHUNK_ID_LEN + 1];
int chunk_size;
FILE *file;
- int i;
#endif
if (!audio.sound_available)
}
/* read chunk id "RIFF" */
- getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunkLE(file, chunk_name, &chunk_size);
if (strcmp(chunk_name, "RIFF") != 0)
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
}
/* read "RIFF" type id "WAVE" */
- getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunkLE(file, chunk_name, NULL);
if (strcmp(chunk_name, "WAVE") != 0)
{
Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
return NULL;
}
- while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN))
+ while (getFileChunkLE(file, chunk_name, &chunk_size))
{
if (strcmp(chunk_name, "fmt ") == 0)
{
- /* read header information */
- for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++)
- sound_header_buffer[i] = fgetc(file);
+ if (chunk_size < WAV_HEADER_SIZE)
+ {
+ Error(ERR_WARN, "sound file '%s': chunk 'fmt ' too short", filename);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ header.compression_code = getFile16BitLE(file);
+ header.num_channels = getFile16BitLE(file);
+ header.sample_rate = getFile32BitLE(file);
+ header.bytes_per_second = getFile32BitLE(file);
+ header.block_align = getFile16BitLE(file);
+ header.bits_per_sample = getFile16BitLE(file);
if (chunk_size > WAV_HEADER_SIZE)
ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE);
+
+ if (header.compression_code != 1)
+ {
+ Error(ERR_WARN, "sound file '%s': compression code %d not supported",
+ filename, header.compression_code);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ if (header.num_channels != 1)
+ {
+ Error(ERR_WARN, "sound file '%s': number of %d channels not supported",
+ filename, header.num_channels);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ if (header.bits_per_sample != 8 && header.bits_per_sample != 16)
+ {
+ Error(ERR_WARN, "sound file '%s': %d bits per sample not supported",
+ filename, header.bits_per_sample);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ /* warn, but accept wrong sample rate (may be only slightly different) */
+ if (header.sample_rate != DEFAULT_AUDIO_SAMPLE_RATE)
+ Error(ERR_WARN, "sound file '%s': wrong sample rate %d instead of %d",
+ filename, header.sample_rate, DEFAULT_AUDIO_SAMPLE_RATE);
+
+#if 0
+ printf("WAV file: '%s'\n", filename);
+ printf(" Compression code: %d'\n", header.compression_code);
+ printf(" Number of channels: %d'\n", header.num_channels);
+ printf(" Sample rate: %ld'\n", header.sample_rate);
+ printf(" Average bytes per second: %ld'\n", header.bytes_per_second);
+ printf(" Block align: %d'\n", header.block_align);
+ printf(" Significant bits per sample: %d'\n", header.bits_per_sample);
+#endif
}
else if (strcmp(chunk_name, "data") == 0)
{
return NULL;
}
- snd_info->format = AUDIO_FORMAT_U8;
+ if (header.bits_per_sample == 8)
+ snd_info->format = AUDIO_FORMAT_U8;
+ else /* header.bits_per_sample == 16 */
+ {
+ snd_info->format = AUDIO_FORMAT_S16;
+ snd_info->data_len /= 2; /* correct number of samples */
+ }
#endif /* AUDIO_UNIX_NATIVE */
void LoadCustomMusic(void)
{
static boolean draw_init_text = TRUE; /* only draw at startup */
+ static char *last_music_directory = NULL;
char *music_directory = getCustomMusicDirectory();
DIR *dir;
struct dirent *dir_entry;
if (!audio.sound_available)
return;
+ if (last_music_directory != NULL &&
+ strcmp(last_music_directory, music_directory) == 0)
+ return; /* old and new music directory are the same */
+
+ if (last_music_directory != NULL)
+ free(last_music_directory);
+ last_music_directory = getStringCopy(music_directory);
+
+ FreeAllMusic();
+
if ((dir = opendir(music_directory)) == NULL)
{
Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
char *filename = getPath2(music_directory, basename);
MusicInfo *mus_info = NULL;
+#if 0
+ printf("DEBUG: loading music '%s' ...\n", basename);
+#endif
+
if (draw_init_text)
DrawInitText(basename, 150, FC_YELLOW);
int i;
#if 0
- printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+ printf("DEBUG: reloading sounds '%s' ...\n",artwork.snd_current_identifier);
#endif
LoadSoundsInfo();
static void ReloadCustomMusic()
{
#if 0
- printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+ printf("DEBUG: reloading music '%s' ...\n", artwork.mus_current_identifier);
#endif
+#if 0
+ /* this is done directly in LoadCustomMusic() now */
FreeAllMusic();
+#endif
LoadCustomMusic();
}
-void InitReloadSounds(char *set_name)
+void InitReloadSounds(char *set_identifier)
{
if (!audio.sound_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
- WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS);
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
#else
ReloadCustomSounds();
#endif
}
-void InitReloadMusic(char *set_name)
+void InitReloadMusic(char *set_identifier)
{
if (!audio.music_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
- WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC);
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC);
#else
ReloadCustomMusic();
#endif
projects / rocksndiamonds.git / blobdiff