X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=0299521267dd802ccd5024467a15590fb286ed22;hb=5ae04ac2ef54f6f164a797c16c9782042cc2ce67;hp=d31bc586cb5c9c8a46622eb6aca0f219ecaa4d9b;hpb=28f0f8708f4b4f8c4f39f1b23bc5fc7e0fed7579;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index d31bc586..02995212 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -52,12 +52,6 @@ #define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) #endif -#if !defined(PLATFORM_HPUX) -#define SND_BLOCKSIZE 4096 -#else -#define SND_BLOCKSIZE 32768 -#endif - #define SND_TYPE_NONE 0 #define SND_TYPE_WAV 1 @@ -124,6 +118,7 @@ struct SampleInfo int format; void *data_ptr; /* pointer to first sample (8 or 16 bit) */ long data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ }; typedef struct SampleInfo SoundInfo; typedef struct SampleInfo MusicInfo; @@ -145,6 +140,7 @@ struct SoundControl int format; void *data_ptr; /* pointer to first sample (8 or 16 bit) */ long data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ #if defined(TARGET_ALLEGRO) int voice; @@ -152,13 +148,15 @@ struct SoundControl }; typedef struct SoundControl SoundControl; -static struct ArtworkListInfo sound_info; - -static struct ArtworkConfigInfo *sound_config = NULL; -static ListNode *SoundFileList = NULL; +static struct ArtworkListInfo *sound_info = NULL; +#if 0 static SoundInfo **Sound = NULL; +#endif static MusicInfo **Music = NULL; -static int num_sounds = 0, num_music = 0; +#if 0 +static int num_sounds = 0; +#endif +static int num_music = 0; static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; @@ -182,6 +180,8 @@ static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); +static SoundInfo *getSoundInfoEntryFromSoundID(int); + /* ------------------------------------------------------------------------- */ /* functions for native (non-SDL) Unix audio/mixer support */ @@ -260,13 +260,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 */ @@ -297,7 +299,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); } @@ -464,7 +466,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) @@ -477,7 +479,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)) @@ -499,7 +501,7 @@ 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 */ @@ -821,6 +823,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) { SoundInfo *snd_info; int i, k; + int num_sounds = getSoundListSize(); #if 0 printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n", @@ -837,15 +840,22 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) else if (snd_ctrl.nr >= num_sounds) return; +#if 0 snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); +#else + snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : + getSoundInfoEntryFromSoundID(snd_ctrl.nr)); +#endif + if (snd_info == NULL) return; /* copy sound sample and format information */ - snd_ctrl.type = snd_info->type; - snd_ctrl.format = snd_info->format; - snd_ctrl.data_ptr = snd_info->data_ptr; - snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.type = snd_info->type; + snd_ctrl.format = snd_info->format; + snd_ctrl.data_ptr = snd_info->data_ptr; + snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.num_channels = snd_info->num_channels; /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) @@ -959,11 +969,16 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) unsigned long playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; +#if 0 +#if DEBUG + /* print some debugging information about audio channel usage */ for (i=audio.first_sound_channel; idata_ptr; - int i; + short *buffer_ptr = buffer_base_ptr + num_output_channels * buffer_pos; + int num_channels = snd_ctrl->num_channels; + int stepsize = num_channels; + int output_stepsize = num_output_channels; + int i, j; if (snd_ctrl->format == AUDIO_FORMAT_U8) - for (i=0; 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) @@ -1258,7 +1286,7 @@ static void Mixer_Main_DSP() } /* prepare final playing buffer according to system audio format */ - for(i=0; idata_len = chunk_size; + data_byte_len = chunk_size; + + snd_info->data_len = data_byte_len; snd_info->data_ptr = checked_malloc(snd_info->data_len); /* read sound data */ @@ -1691,8 +1725,8 @@ static void *Load_WAV(char *filename) return NULL; } - /* check for odd number of sample bytes (data chunk is word aligned) */ - if ((chunk_size % 2) == 1) + /* check for odd number of data bytes (data chunk is word aligned) */ + if ((data_byte_len % 2) == 1) ReadUnusedBytesFromFile(file, 1); } else /* unknown chunk -- ignore */ @@ -1716,6 +1750,29 @@ static void *Load_WAV(char *filename) snd_info->data_len /= 2; /* correct number of samples */ } + snd_info->num_channels = header.num_channels; + if (header.num_channels == 2) + snd_info->data_len /= 2; /* correct number of samples */ + +#if 0 + if (header.num_channels == 1) /* convert mono sound to stereo */ + { + void *buffer_ptr = checked_malloc(data_byte_len * 2); + void *sample_ptr = snd_info->data_ptr; + int sample_size = snd_info->data_len; + int i; + + if (snd_ctrl->format == AUDIO_FORMAT_U8) + for (i=0; itype = SND_TYPE_WAV; @@ -1724,125 +1781,119 @@ static void *Load_WAV(char *filename) return snd_info; } -static void deleteSoundEntry(SoundInfo **snd_info) +int getSoundListSize() { - if (*snd_info) - { - char *filename = (*snd_info)->source_filename; + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); +} -#if 0 - printf("[decrementing reference counter of sound '%s']\n", filename); -#endif +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); - if (--(*snd_info)->num_references <= 0) - { -#if 0 - printf("[deleting sound '%s']\n", filename); -#endif + return (pos < num_list_entries ? &sound_info->file_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} - /* - FreeSound(*snd_info); - */ - deleteNodeFromList(&SoundFileList, filename, FreeSound); - } +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); - *snd_info = NULL; - } + return snd_info[list_pos]; } -static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +int getSoundListPropertyMappingSize() { - ListNode *node; + return sound_info->num_property_mapping_entries; +} - /* check if the old and the new sound file are the same */ - if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) - { - /* The old and new sound are the same (have the same filename and path). - This usually means that this sound does not exist in this sound set - and a fallback to the existing sound is done. */ +struct PropertyMapping *getSoundListPropertyMapping() +{ + return sound_info->property_mapping; +} -#if 0 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif +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; - return; - } + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; - /* delete existing sound file entry */ - deleteSoundEntry(snd_info); + /* ---------- initialize file list and suffix lists ---------- */ - /* check if the new sound file already exists in the list of sounds */ - if ((node = getNodeFromKey(SoundFileList, filename)) != NULL) - { -#if 0 - printf("[sound '%s' already exists (other list entry)]\n", filename); -#endif + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; - *snd_info = (SoundInfo *)node->content; - (*snd_info)->num_references++; - } - else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */ - { - (*snd_info)->num_references = 1; - addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info); - } -} + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; -static void LoadCustomSound(SoundInfo **snd_info, char *basename) -{ - char *filename = getCustomSoundFilename(basename); + sound_info->num_suffix_list_entries = 0; + for (i=0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; -#if 0 - printf("GOT CUSTOM SOUND FILE '%s'\n", filename); -#endif + sound_info->suffix_list = config_suffix_list; - if (strcmp(basename, SND_FILE_UNDEFINED) == 0) - { - deleteSoundEntry(snd_info); - return; - } + /* ---------- initialize base prefix and suffixes lists ---------- */ - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } + sound_info->num_base_prefixes = 0; + for (i=0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; - replaceSoundEntry(snd_info, filename); -} + sound_info->num_ext1_suffixes = 0; + for (i=0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; -void InitSoundList(struct ArtworkConfigInfo *config_list, int num_list_entries) -{ - if (Sound == NULL) - Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + sound_info->num_ext2_suffixes = 0; + for (i=0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; - sound_config = config_list; - num_sounds = num_list_entries; + sound_info->num_ext3_suffixes = 0; + for (i=0; ext3_suffixes[i] != NULL; i++) + sound_info->num_ext3_suffixes++; - sound_info.type = ARTWORK_TYPE_SOUNDS; - sound_info.num_list_entries = num_list_entries; - sound_info.config_list = config_list; - sound_info.artwork_list = (struct ArtworkListNodeInfo **)Sound; - sound_info.file_list = NULL; - sound_info.load_artwork = Load_WAV; - sound_info.free_artwork = FreeSound; -} + sound_info->num_ignore_tokens = 0; + for (i=0; ignore_tokens[i] != NULL; i++) + sound_info->num_ignore_tokens++; -void LoadSoundToList(char *basename, int list_pos) -{ - if (Sound == NULL || list_pos >= num_sounds) - return; + 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; -#if 0 - printf("loading sound '%s' ... [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + 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 *); - LoadCustomSound(&Sound[list_pos], basename); + 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 - printf("loading sound '%s' done [%d]\n", - basename, getNumNodes(SoundFileList)); + num_sounds = sound_info->num_file_list_entries; + Sound = (SoundInfo **)sound_info->artwork_list; #endif } @@ -1927,7 +1978,7 @@ void LoadCustomMusic(void) { num_music++; Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); - Music[num_music -1] = mus_info; + Music[num_music - 1] = mus_info; } } @@ -2048,52 +2099,19 @@ void StopSoundExt(int nr, int state) HandleSoundRequest(snd_ctrl); } -#if 1 -static void ReloadCustomSounds() -{ - ReloadCustomArtworkFiles(&sound_info); -} -#else static void ReloadCustomSounds() { - static boolean draw_init_text = TRUE; /* only draw at startup */ - int i; - -#if 0 - printf("DEBUG: reloading sounds '%s' ...\n",artwork.snd_current_identifier); -#endif - - LoadArtworkConfig(&sound_info); - - if (draw_init_text) - DrawInitText("Loading sounds:", 120, FC_GREEN); - #if 0 - printf("DEBUG: reloading %d sounds ...\n", num_sounds); + printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier); #endif - for(i=0; i