X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=a70ea3accf9018ed7c264f76b6bc06f61a89f5b6;hb=8f33ee4940b9c35bf4627b7ef1126d03748da646;hp=214b27bf8299de7d20d7705d24f8653a1a5fc0bb;hpb=f4fa296527b424d80cb6ed86809986455613783c;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 214b27bf..a70ea3ac 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -149,9 +149,19 @@ struct SoundControl typedef struct SoundControl SoundControl; static struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; + +#if 0 static SoundInfo **Sound = NULL; -static MusicInfo **Music = NULL; -static int num_sounds = 0, num_music = 0; +#endif + +static MusicInfo **Music_NoConf = NULL; + +#if 0 +static int num_sounds = 0; +#endif + +static int num_music_noconf = 0; static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; @@ -174,6 +184,11 @@ static int ulaw_to_linear(unsigned char); static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); +static void FreeMusic(void *); +static void FreeAllMusic_NoConf(); + +static SoundInfo *getSoundInfoEntryFromSoundID(int); +static MusicInfo *getMusicInfoEntryFromMusicID(int); /* ------------------------------------------------------------------------- */ @@ -222,7 +237,7 @@ static boolean TestAudioDevices(void) int i; /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) break; @@ -253,13 +268,15 @@ static boolean ForkAudioProcess(void) return FALSE; } + if (audio.mixer_pid == 0) /* we are the child process */ + audio.mixer_pid = getpid(); + #if 0 - printf("PID: %d [%s]\n", getpid(), - (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent")); + printf("PID: %d [%s]\n", getpid(),(IS_CHILD_PROCESS() ? "child" : "parent")); Delay(10000 * 0); #endif - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (IS_CHILD_PROCESS()) Mixer_Main(); /* this function never returns */ else close(audio.mixer_pipe[0]); /* no reading from pipe needed */ @@ -290,7 +307,7 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS()) kill(audio.mixer_pid, SIGTERM); } @@ -305,7 +322,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) /* "ioctl()" expects pointer to 'int' value for stereo flag (boolean is defined as 'char', which will not work here) */ unsigned int fragment_spec = 0; - int fragment_size_query; + int fragment_size_query = -1; int stereo = TRUE; struct { @@ -457,7 +474,7 @@ static void InitAudioDevice(struct AudioFormatInfo *afmt) static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) { - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (IS_CHILD_PROCESS()) return; if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0) @@ -470,7 +487,7 @@ static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) { - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS()) return; if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl)) @@ -492,12 +509,14 @@ static void WriteReloadInfoToPipe(char *set_identifier, int type) setup.override_level_sounds : setup.override_level_music); - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (IS_CHILD_PROCESS()) return; if (leveldir_current == NULL) /* should never happen */ Error(ERR_EXIT, "leveldir_current == NULL"); + memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */ + snd_ctrl.active = FALSE; snd_ctrl.state = type; snd_ctrl.data_len = strlen(set_identifier) + 1; @@ -550,8 +569,7 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) &setup.override_level_sounds : &setup.override_level_music); - if (set_identifier) - free(set_identifier); + checked_free(set_identifier); set_identifier = checked_malloc(snd_ctrl->data_len); @@ -560,16 +578,12 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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); + + checked_free(leveldir_current->fullpath); + checked_free(leveldir_current->sounds_path); + checked_free(leveldir_current->music_path); + checked_free(ti->basepath); + checked_free(ti->fullpath); if (read(audio.mixer_pipe[0], set_identifier, snd_ctrl->data_len) != snd_ctrl->data_len || @@ -626,7 +640,7 @@ void Mixer_InitChannels() { int i; - for(i=0; i= num_music) /* invalid music */ + return; + + if (snd_ctrl.nr < 0) /* undefined music */ + { + if (num_music_noconf == 0) /* no fallback music available */ + return; + + snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf; + snd_info = Music_NoConf[snd_ctrl.nr]; + } + else + snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr); + } + else { - if (num_music == 0) + if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds) return; - snd_ctrl.nr = snd_ctrl.nr % num_music; + snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr); + } + + /* + if (snd_ctrl.nr >= (IS_MUSIC(snd_ctrl) ? num_music : num_sounds)) + return; + */ +#else + if (IS_MUSIC(snd_ctrl)) + { + if (num_music_noconf == 0) + return; + + snd_ctrl.nr = snd_ctrl.nr % num_music_noconf; } else if (snd_ctrl.nr >= num_sounds) return; +#endif + +#if 0 +#if 1 + snd_info = (IS_MUSIC(snd_ctrl) ? getMusicInfoEntryFromMusicID(snd_ctrl.nr) : + getSoundInfoEntryFromSoundID(snd_ctrl.nr)); +#else + snd_info = (IS_MUSIC(snd_ctrl) ? Music_NoConf[snd_ctrl.nr] : + getSoundInfoEntryFromSoundID(snd_ctrl.nr)); +#endif +#endif - snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); if (snd_info == NULL) return; @@ -844,6 +910,10 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) { +#if 0 + printf("::: slot %d, ptr 0x%08x\n", snd_ctrl.nr, snd_ctrl.data_ptr); +#endif + Mixer_StopMusicChannel(); mixer[audio.music_channel] = snd_ctrl; @@ -853,7 +923,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) } /* check if (and how often) this sound sample is already playing */ - for (k=0, i=audio.first_sound_channel; i 0 && IS_LOOP(snd_ctrl)) { - for(i=audio.first_sound_channel; idata_ptr + num_channels * sample_pos; - for (i=0; inum_channels == 1 ? 0 : i); - for (j=0; jdata_ptr + num_channels * sample_pos; - for (i=0; inum_channels == 1 ? 0 : i); - for (j=0; j= mixer[i].data_len) Mixer_StopChannel(i); - for(i=0; i> 8) ^ 0x80; /* finally play the sound fragment */ @@ -1374,7 +1444,7 @@ void Mixer_Main() FD_ZERO(&mixer_fdset); FD_SET(audio.mixer_pipe[0], &mixer_fdset); - while(1) /* wait for sound playing commands from client */ + while (1) /* wait for sound playing commands from client */ { struct timeval delay = { 0, 0 }; @@ -1747,11 +1817,11 @@ static void *Load_WAV(char *filename) int i; if (snd_ctrl->format == AUDIO_FORMAT_U8) - for (i=0; ifile_list; -} - -void InitSoundList(struct ConfigInfo *config_list, - struct ConfigInfo *config_suffix_list, - int num_file_list_entries) -{ - int i; - - sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); - - sound_info->type = ARTWORK_TYPE_SOUNDS; - - sound_info->num_file_list_entries = num_file_list_entries; - sound_info->num_suffix_list_entries = 0; - for (i=0; config_suffix_list[i].token != NULL; i++) - sound_info->num_suffix_list_entries++; - - sound_info->file_list = - getFileListFromConfigList(config_list, config_suffix_list, - num_file_list_entries); - sound_info->suffix_list = config_suffix_list; - - sound_info->artwork_list = - checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); - - sound_info->content_list = NULL; - - sound_info->load_artwork = Load_WAV; - sound_info->free_artwork = FreeSound; - - num_sounds = sound_info->num_file_list_entries; - Sound = (SoundInfo **)sound_info->artwork_list; -} - -static MusicInfo *Load_MOD(char *filename) +static void *Load_MOD(char *filename) { #if defined(TARGET_SDL) MusicInfo *mod_info; @@ -1828,13 +1861,24 @@ static MusicInfo *Load_MOD(char *filename) #endif } -void LoadCustomMusic(void) +static void *Load_WAV_or_MOD(char *filename) +{ + if (FileIsSound(filename)) + return Load_WAV(filename); + else if (FileIsMusic(filename)) + return Load_MOD(filename); + else + return NULL; +} + +void LoadCustomMusic_NoConf(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; + int num_music = getMusicListSize(); if (!audio.sound_available) return; @@ -1847,7 +1891,7 @@ void LoadCustomMusic(void) free(last_music_directory); last_music_directory = getStringCopy(music_directory); - FreeAllMusic(); + FreeAllMusic_NoConf(); if ((dir = opendir(music_directory)) == NULL) { @@ -1862,28 +1906,53 @@ void LoadCustomMusic(void) while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { char *basename = dir_entry->d_name; - char *filename = getPath2(music_directory, basename); + char *filename = NULL; MusicInfo *mus_info = NULL; + boolean music_already_used = FALSE; + int i; + + for (i = 0; i < num_music; i++) + { + struct FileInfo *music = getMusicListEntry(i); + + if (strcmp(basename, music->filename) == 0) + { + music_already_used = TRUE; + break; + } + } + + if (music_already_used) + continue; #if 0 - printf("DEBUG: loading music '%s' ...\n", basename); + if (FileIsSound(basename) || FileIsMusic(basename)) + printf("DEBUG: loading music '%s' ...\n", basename); #endif if (draw_init_text) DrawInitText(basename, 150, FC_YELLOW); + filename = getPath2(music_directory, basename); + +#if 1 + if (FileIsMusic(basename)) + mus_info = Load_WAV_or_MOD(filename); +#else if (FileIsSound(basename)) mus_info = Load_WAV(filename); else if (FileIsMusic(basename)) mus_info = Load_MOD(filename); +#endif free(filename); if (mus_info) { - num_music++; - Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); - Music[num_music -1] = mus_info; + num_music_noconf++; + Music_NoConf = checked_realloc(Music_NoConf, + num_music_noconf * sizeof(MusicInfo *)); + Music_NoConf[num_music_noconf - 1] = mus_info; } } @@ -1891,11 +1960,238 @@ void LoadCustomMusic(void) draw_init_text = FALSE; - if (num_music == 0) + if (num_music_noconf == 0) Error(ERR_WARN, "cannot find any valid music files in directory '%s'", music_directory); } +int getSoundListSize() +{ + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); +} + +int getMusicListSize() +{ + return (music_info->num_file_list_entries + + music_info->num_dynamic_file_list_entries); +} + +struct FileInfo *getSoundListEntry(int pos) +{ + int num_list_entries = sound_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + + return (pos < num_list_entries ? &sound_info->file_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} + +struct FileInfo *getMusicListEntry(int pos) +{ + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + + return (pos < num_list_entries ? &music_info->file_list[list_pos] : + &music_info->dynamic_file_list[list_pos]); +} + +static SoundInfo *getSoundInfoEntryFromSoundID(int pos) +{ + int num_list_entries = sound_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + SoundInfo **snd_info = + (SoundInfo **)(pos < num_list_entries ? sound_info->artwork_list : + sound_info->dynamic_artwork_list); + + return snd_info[list_pos]; +} + +static MusicInfo *getMusicInfoEntryFromMusicID(int pos) +{ + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + MusicInfo **mus_info = + (MusicInfo **)(pos < num_list_entries ? music_info->artwork_list : + music_info->dynamic_artwork_list); + + return mus_info[list_pos]; +} + +int getSoundListPropertyMappingSize() +{ + return sound_info->num_property_mapping_entries; +} + +int getMusicListPropertyMappingSize() +{ + return music_info->num_property_mapping_entries; +} + +struct PropertyMapping *getSoundListPropertyMapping() +{ + return sound_info->property_mapping; +} + +struct PropertyMapping *getMusicListPropertyMapping() +{ + return music_info->property_mapping; +} + +void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, + struct ConfigInfo *config_suffix_list, + char **base_prefixes, char **ext1_suffixes, + char **ext2_suffixes, char **ext3_suffixes, + char **ignore_tokens) +{ + int i; + + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; + + /* ---------- initialize file list and suffix lists ---------- */ + + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; + + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; + + sound_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; + + sound_info->suffix_list = config_suffix_list; + + /* ---------- initialize base prefix and suffixes lists ---------- */ + + sound_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; + + sound_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; + + sound_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; + + sound_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + sound_info->num_ext3_suffixes++; + + sound_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + sound_info->num_ignore_tokens++; + + sound_info->base_prefixes = base_prefixes; + sound_info->ext1_suffixes = ext1_suffixes; + sound_info->ext2_suffixes = ext2_suffixes; + sound_info->ext3_suffixes = ext3_suffixes; + sound_info->ignore_tokens = ignore_tokens; + + sound_info->num_property_mapping_entries = 0; + + sound_info->property_mapping = NULL; + + /* ---------- initialize artwork reference and content lists ---------- */ + + sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *); + + sound_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); + sound_info->dynamic_artwork_list = NULL; + + sound_info->content_list = NULL; + + /* ---------- initialize artwork loading/freeing functions ---------- */ + + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; + +#if 0 + num_sounds = sound_info->num_file_list_entries; + Sound = (SoundInfo **)sound_info->artwork_list; +#endif +} + +void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries, + struct ConfigInfo *config_suffix_list, + char **base_prefixes, char **ext1_suffixes, + char **ext2_suffixes, char **ext3_suffixes, + char **ignore_tokens) +{ + int i; + + music_info = checked_calloc(sizeof(struct ArtworkListInfo)); + music_info->type = ARTWORK_TYPE_MUSIC; + + /* ---------- initialize file list and suffix lists ---------- */ + + music_info->num_file_list_entries = num_file_list_entries; + music_info->num_dynamic_file_list_entries = 0; + + music_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + music_info->dynamic_file_list = NULL; + + music_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + music_info->num_suffix_list_entries++; + + music_info->suffix_list = config_suffix_list; + + /* ---------- initialize base prefix and suffixes lists ---------- */ + + music_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + music_info->num_base_prefixes++; + + music_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + music_info->num_ext1_suffixes++; + + music_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + music_info->num_ext2_suffixes++; + + music_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + music_info->num_ext3_suffixes++; + + music_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + music_info->num_ignore_tokens++; + + music_info->base_prefixes = base_prefixes; + music_info->ext1_suffixes = ext1_suffixes; + music_info->ext2_suffixes = ext2_suffixes; + music_info->ext3_suffixes = ext3_suffixes; + music_info->ignore_tokens = ignore_tokens; + + music_info->num_property_mapping_entries = 0; + + music_info->property_mapping = NULL; + + /* ---------- initialize artwork reference and content lists ---------- */ + + music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *); + + music_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(MusicInfo *)); + music_info->dynamic_artwork_list = NULL; + + music_info->content_list = NULL; + + /* ---------- initialize artwork loading/freeing functions ---------- */ + + music_info->load_artwork = Load_WAV_or_MOD; + music_info->free_artwork = FreeMusic; +} + void PlayMusic(int nr) { if (!audio.music_available) @@ -1943,6 +2239,8 @@ void PlaySoundExt(int nr, int volume, int stereo_position, int state) else if (stereo_position > SOUND_MAX_RIGHT) stereo_position = SOUND_MAX_RIGHT; + memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */ + snd_ctrl.active = TRUE; snd_ctrl.nr = nr; snd_ctrl.volume = volume; @@ -1967,10 +2265,15 @@ void FadeSound(int nr) void FadeSounds() { - FadeMusic(); StopSoundExt(-1, SND_CTRL_FADE_ALL); } +void FadeSoundsAndMusic() +{ + FadeSounds(); + FadeMusic(); +} + void StopMusic(void) { if (!audio.music_available) @@ -1997,6 +2300,8 @@ void StopSoundExt(int nr, int state) if (!audio.sound_available) return; + memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */ + snd_ctrl.active = FALSE; snd_ctrl.nr = nr; snd_ctrl.state = state; @@ -2010,7 +2315,12 @@ static void ReloadCustomSounds() printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier); #endif + LoadArtworkConfig(sound_info); ReloadCustomArtworkList(sound_info); + +#if 0 + num_sounds = getSoundListSize(); +#endif } static void ReloadCustomMusic() @@ -2019,27 +2329,35 @@ static void ReloadCustomMusic() printf("DEBUG: reloading music '%s' ...\n", artwork.mus_current_identifier); #endif - LoadCustomMusic(); + LoadArtworkConfig(music_info); + ReloadCustomArtworkList(music_info); + +#if 1 + /* load all music files from directory not defined in "musicinfo.conf" */ + LoadCustomMusic_NoConf(); +#endif } -void InitReloadSounds(char *set_identifier) +void InitReloadCustomSounds(char *set_identifier) { if (!audio.sound_available) return; #if defined(AUDIO_UNIX_NATIVE) + LoadArtworkConfig(sound_info); /* also load config on sound client */ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS); #else ReloadCustomSounds(); #endif } -void InitReloadMusic(char *set_identifier) +void InitReloadCustomMusic(char *set_identifier) { if (!audio.music_available) return; #if defined(AUDIO_UNIX_NATIVE) + LoadArtworkConfig(music_info); /* also load config on sound client */ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC); #else ReloadCustomMusic(); @@ -2064,14 +2382,15 @@ void FreeSound(void *ptr) #endif } - if (sound->source_filename) - free(sound->source_filename); + checked_free(sound->source_filename); free(sound); } -void FreeMusic(MusicInfo *music) +void FreeMusic(void *ptr) { + MusicInfo *music = (MusicInfo *)ptr; + if (music == NULL) return; @@ -2092,25 +2411,31 @@ void FreeMusic(MusicInfo *music) free(music); } -void FreeAllSounds() -{ - FreeCustomArtworkList(sound_info); -} - -void FreeAllMusic() +static void FreeAllMusic_NoConf() { int i; - if (Music == NULL) + if (Music_NoConf == NULL) return; - for(i=0; i