X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=e98c42a2d2056b2977958837e1acf1cb957dcc2a;hb=838825e11f7e4af0947bf9d40061defd4e499017;hp=22f4fb9695fda5514f3c57f309ff21ab31f70ffb;hpb=9c6293f12f9dea224bff9050050253e9f52e3819;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 22f4fb96..e98c42a2 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,8 +11,9 @@ * sound.c * ***********************************************************/ -#include +#include #include +#include #include #include #include @@ -46,12 +47,8 @@ /* one second fading interval == 1000 ticks (milliseconds) */ #define SOUND_FADING_INTERVAL 1000 -#if defined(TARGET_SDL) -#define SOUND_MAX_VOLUME SDL_MIX_MAXVOLUME -#endif - #if defined(AUDIO_STREAMING_DSP) -#define SOUND_FADING_VOLUME_STEP (PSND_MAX_VOLUME / 40) +#define SOUND_FADING_VOLUME_STEP (SOUND_MAX_VOLUME / 40) #define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) #endif @@ -69,9 +66,15 @@ #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 @@ -92,6 +95,18 @@ struct SoundHeader_8SVX }; #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 */ @@ -107,8 +122,8 @@ struct SampleInfo 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; @@ -128,10 +143,10 @@ struct SoundControl 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(PLATFORM_MSDOS) +#if defined(TARGET_ALLEGRO) int voice; #endif }; @@ -157,6 +172,7 @@ static ListNode *SoundFileList = NULL; static SoundInfo **Sound = NULL; static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; /* ========================================================================= */ @@ -219,6 +235,7 @@ static boolean TestAudioDevices(void) static char *audio_device_name[] = { DEVICENAME_DSP, + DEVICENAME_SOUND_DSP, DEVICENAME_AUDIO }; int audio_device_fd = -1; @@ -335,7 +352,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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; @@ -351,7 +368,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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; @@ -360,15 +377,15 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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 */ @@ -382,8 +399,8 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) 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; @@ -397,7 +414,7 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) 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 */ @@ -410,7 +427,7 @@ static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) 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"); @@ -475,7 +492,7 @@ static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) 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 : @@ -483,6 +500,9 @@ static void WriteReloadInfoToPipe(char *set_name, int type) 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; + 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; @@ -492,12 +512,14 @@ static void WriteReloadInfoToPipe(char *set_name, int type) 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, @@ -527,12 +549,15 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) &artwork.snd_current : &artwork.mus_current); TreeInfo *ti = *ti_ptr; unsigned long str_size1, str_size2, str_size3; - static char *set_name = NULL; + 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)); @@ -545,8 +570,10 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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, @@ -572,9 +599,9 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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 */ @@ -632,30 +659,56 @@ static boolean Mixer_ChannelExpired(int channel) return FALSE; } -static void Mixer_PlayChannel(int channel) +static boolean Mixer_AllocateChannel(int channel) { - /* start with inactive channel in case something goes wrong */ - mixer[channel].active = FALSE; +#if defined(TARGET_ALLEGRO) + mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr); + if (mixer[channel].voice < 0) + return FALSE; +#endif - if (mixer[channel].type != MUS_TYPE_WAV) - return; + return TRUE; +} + +static void Mixer_SetChannelProperties(int channel) +{ +#if defined(TARGET_SDL) + Mix_Volume(channel, mixer[channel].volume); + Mix_SetPanning(channel, + SOUND_VOLUME_LEFT(mixer[channel].stereo_position), + SOUND_VOLUME_RIGHT(mixer[channel].stereo_position)); +#elif defined(TARGET_ALLEGRO) + voice_set_volume(mixer[channel].voice, mixer[channel].volume); + voice_set_pan(mixer[channel].voice, mixer[channel].stereo_position); +#endif +} +static void Mixer_StartChannel(int channel) +{ #if defined(TARGET_SDL) - Mix_Volume(channel, SOUND_MAX_VOLUME); Mix_PlayChannel(channel, mixer[channel].data_ptr, IS_LOOP(mixer[channel]) ? -1 : 0); -#elif defined(PLATFORM_MSDOS) - mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr); - if (mixer[channel].voice < 0) - return; - +#elif defined(TARGET_ALLEGRO) if (IS_LOOP(mixer[channel])) voice_set_playmode(mixer[channel].voice, PLAYMODE_LOOP); - voice_set_volume(mixer[channel].voice, mixer[channel].volume); - voice_set_pan(mixer[channel].voice, mixer[channel].stereo_position); voice_start(mixer[channel].voice); #endif +} + +static void Mixer_PlayChannel(int channel) +{ + /* start with inactive channel in case something goes wrong */ + mixer[channel].active = FALSE; + + if (mixer[channel].type != MUS_TYPE_WAV) + return; + + if (!Mixer_AllocateChannel(channel)) + return; + + Mixer_SetChannelProperties(channel); + Mixer_StartChannel(channel); Mixer_ResetChannelExpiration(channel); @@ -686,7 +739,7 @@ static void Mixer_StopChannel(int channel) #if defined(TARGET_SDL) Mix_HaltChannel(channel); -#elif defined(PLATFORM_MSDOS) +#elif defined(TARGET_ALLEGRO) voice_set_volume(mixer[channel].voice, 0); deallocate_voice(mixer[channel].voice); #endif @@ -713,7 +766,7 @@ static void Mixer_FadeChannel(int channel) #if defined(TARGET_SDL) Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); -#elif defined(PLATFORM_MSDOS) +#elif defined(TARGET_ALLEGRO) if (voice_check(mixer[channel].voice)) voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0); #endif @@ -734,11 +787,11 @@ static void Mixer_UnFadeChannel(int channel) return; mixer[channel].state &= ~SND_CTRL_FADE; - mixer[channel].volume = PSND_MAX_VOLUME; + mixer[channel].volume = SOUND_MAX_VOLUME; #if defined(TARGET_SDL) Mix_ExpireChannel(channel, -1); - Mix_Volume(channel, SOUND_MAX_VOLUME); + Mix_Volume(channel, mixer[channel].volume); #elif defined(TARGET_ALLEGRO) voice_stop_volumeramp(mixer[channel].voice); voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, @@ -752,15 +805,17 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) 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; @@ -777,15 +832,17 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) { + 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= 2) { @@ -826,7 +896,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) 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; @@ -847,12 +917,36 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) 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; idata_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); @@ -956,7 +1032,7 @@ static void HandleSoundRequest(SoundControl snd_ctrl) } for(i=audio.first_sound_channel; i> PSND_MAX_VOLUME_BITS; + mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* fill the last mixing buffer with stereo or mono sound */ if (stereo) { - int middle_pos = PSND_MAX_LEFT2RIGHT / 2; - int left_volume = stereo_volume[middle_pos + mixer[i].stereo_position]; - int right_volume= stereo_volume[middle_pos - mixer[i].stereo_position]; + int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position); + int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position); for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; + left_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT; premix_right_buffer[j] = - (right_volume * premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; + right_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT; premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; @@ -1233,14 +1301,13 @@ static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) premix_first_buffer); /* adjust volume of actual sound sample */ - if (mixer[i].volume != PSND_MAX_VOLUME) + if (mixer[i].volume != SOUND_MAX_VOLUME) for(j=0; j> PSND_MAX_VOLUME_BITS; + 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 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) { @@ -1567,7 +1690,13 @@ static SoundInfo *Load_WAV(char *filename) 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 */ @@ -1720,6 +1849,7 @@ static MusicInfo *Load_MOD(char *filename) 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; @@ -1727,6 +1857,14 @@ void LoadCustomMusic(void) 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 */ + + last_music_directory = music_directory; + + FreeAllMusic(); + if ((dir = opendir(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); @@ -1780,22 +1918,22 @@ void PlayMusic(int nr) void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); } void PlaySoundExt(int nr, int volume, int stereo_position, int state) @@ -1807,15 +1945,15 @@ void PlaySoundExt(int nr, int volume, int stereo_position, int state) audio.sound_deactivated) return; - if (volume < PSND_MIN_VOLUME) - volume = PSND_MIN_VOLUME; - else if (volume > PSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; - if (stereo_position < PSND_MAX_LEFT) - stereo_position = PSND_MAX_LEFT; - else if (stereo_position > PSND_MAX_RIGHT) - stereo_position = PSND_MAX_RIGHT; + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; snd_ctrl.active = TRUE; snd_ctrl.nr = nr; @@ -1997,7 +2135,7 @@ static void ReloadCustomSounds() int i; #if 0 - printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current); + printf("DEBUG: reloading sounds '%s' ...\n",artwork.sounds_set_current_name); #endif LoadSoundsInfo(); @@ -2034,35 +2172,38 @@ static void ReloadCustomSounds() static void ReloadCustomMusic() { #if 0 - printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current); + printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current_name); #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(TARGET_SDL) || defined(TARGET_ALLEGRO) +#if defined(AUDIO_UNIX_NATIVE) + WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS); +#else ReloadCustomSounds(); -#elif defined(AUDIO_UNIX_NATIVE) - WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS); #endif } -void InitReloadMusic(char *set_name) +void InitReloadMusic(char *set_identifier) { if (!audio.music_available) return; -#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO) +#if defined(AUDIO_UNIX_NATIVE) + WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC); +#else ReloadCustomMusic(); -#elif defined(AUDIO_UNIX_NATIVE) - WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC); #endif }