X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=1a403e7be7c60ccfd53b0a2b614af3c41f1dd237;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=6f48576667caf33254d8960e3338e51b9a55cf9c;hpb=1e4d3fd0343fa76d5d1e2803b33bb6faa97403d4;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 6f485766..1a403e7b 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,23 +148,7 @@ struct SoundControl }; typedef struct SoundControl SoundControl; -struct ListNode -{ - char *key; - void *content; - struct ListNode *next; -}; -typedef struct ListNode ListNode; - -static ListNode *newListNode(void); -static void addNodeToList(ListNode **, char *, void *); -static void deleteNodeFromList(ListNode **, char *, void (*function)(void *)); -static ListNode *getNodeFromKey(ListNode *, char *); -static int getNumNodes(ListNode *); - - -static struct SoundEffectInfo *sound_effect; -static ListNode *SoundFileList = NULL; +static struct ArtworkListInfo *sound_info = NULL; static SoundInfo **Sound = NULL; static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; @@ -273,6 +253,12 @@ static boolean ForkAudioProcess(void) 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 @@ -492,14 +478,16 @@ 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 : 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); @@ -512,11 +500,11 @@ 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 || @@ -530,12 +518,20 @@ static void WriteReloadInfoToPipe(char *set_name, int type) 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; @@ -548,29 +544,34 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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) || @@ -583,25 +584,35 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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_name = set_name; + artwork.snd_current_identifier = set_identifier; else - artwork.music_set_current_name = set_name; + artwork.mus_current_identifier = set_identifier; } #endif /* AUDIO_UNIX_NATIVE */ @@ -824,10 +835,11 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) 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)) @@ -941,11 +953,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) @@ -1240,7 +1270,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 */ @@ -1673,8 +1709,8 @@ static SoundInfo *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 */ @@ -1698,126 +1734,73 @@ static SoundInfo *Load_WAV(char *filename) snd_info->data_len /= 2; /* correct number of samples */ } -#endif /* AUDIO_UNIX_NATIVE */ - - snd_info->type = SND_TYPE_WAV; - snd_info->source_filename = getStringCopy(filename); - - return snd_info; -} - -static void deleteSoundEntry(SoundInfo **snd_info) -{ - if (*snd_info) - { - char *filename = (*snd_info)->source_filename; + snd_info->num_channels = header.num_channels; + if (header.num_channels == 2) + snd_info->data_len /= 2; /* correct number of samples */ #if 0 - printf("[decrementing reference counter of sound '%s']\n", filename); + 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; inum_references <= 0) - { -#if 0 - printf("[deleting sound '%s']\n", filename); -#endif +#endif /* AUDIO_UNIX_NATIVE */ - /* - FreeSound(*snd_info); - */ - deleteNodeFromList(&SoundFileList, filename, FreeSound); - } + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); - *snd_info = NULL; - } + return snd_info; } -static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +struct FileInfo *getCurrentSoundList() { - ListNode *node; - - /* 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. */ - -#if 0 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif - - return; - } - - /* delete existing sound file entry */ - deleteSoundEntry(snd_info); - - /* 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 - - *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); - } + return sound_info->file_list; } -static void LoadCustomSound(SoundInfo **snd_info, char *basename) +void InitSoundList(struct ConfigInfo *config_list, + struct ConfigInfo *config_suffix_list, + int num_file_list_entries) { - char *filename = getCustomSoundFilename(basename); - -#if 0 - printf("GOT CUSTOM SOUND FILE '%s'\n", filename); -#endif - - if (strcmp(basename, SND_FILE_UNDEFINED) == 0) - { - deleteSoundEntry(snd_info); - return; - } + int i; - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); - replaceSoundEntry(snd_info, filename); -} + sound_info->type = ARTWORK_TYPE_SOUNDS; -void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) -{ - if (Sound == NULL) - Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + 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_effect = sounds_list; - num_sounds = num_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->custom_setup_list = NULL; -void LoadSoundToList(char *basename, int list_pos) -{ - if (Sound == NULL || list_pos >= num_sounds) - return; + sound_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); -#if 0 - printf("loading sound '%s' ... [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + sound_info->content_list = NULL; - LoadCustomSound(&Sound[list_pos], basename); + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; -#if 0 - printf("loading sound '%s' done [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + num_sounds = sound_info->num_file_list_entries; + Sound = (SoundInfo **)sound_info->artwork_list; } static MusicInfo *Load_MOD(char *filename) @@ -1861,7 +1844,9 @@ void LoadCustomMusic(void) strcmp(last_music_directory, music_directory) == 0) return; /* old and new music directory are the same */ - last_music_directory = music_directory; + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); FreeAllMusic(); @@ -1881,6 +1866,10 @@ void LoadCustomMusic(void) 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); @@ -2016,192 +2005,45 @@ void StopSoundExt(int nr, int state) HandleSoundRequest(snd_ctrl); } -ListNode *newListNode() -{ - return checked_calloc(sizeof(ListNode)); -} - -void addNodeToList(ListNode **node_first, char *key, void *content) -{ - ListNode *node_new = newListNode(); - -#if 0 - printf("LIST: adding node with key '%s'\n", key); -#endif - - node_new->key = getStringCopy(key); - node_new->content = content; - node_new->next = *node_first; - *node_first = node_new; -} - -void deleteNodeFromList(ListNode **node_first, char *key, - void (*destructor_function)(void *)) -{ - if (node_first == NULL || *node_first == NULL) - return; - -#if 0 - printf("[CHECKING LIST KEY '%s' == '%s']\n", - (*node_first)->key, key); -#endif - - if (strcmp((*node_first)->key, key) == 0) - { -#if 0 - printf("[DELETING LIST ENTRY]\n"); -#endif - - free((*node_first)->key); - if (destructor_function) - destructor_function((*node_first)->content); - *node_first = (*node_first)->next; - } - else - deleteNodeFromList(&(*node_first)->next, key, destructor_function); -} - -ListNode *getNodeFromKey(ListNode *node_first, char *key) -{ - if (node_first == NULL) - return NULL; - - if (strcmp(node_first->key, key) == 0) - return node_first; - else - return getNodeFromKey(node_first->next, key); -} - -int getNumNodes(ListNode *node_first) -{ - return (node_first ? 1 + getNumNodes(node_first->next) : 0); -} - -void dumpList(ListNode *node_first) -{ - ListNode *node = node_first; - - while (node) - { - printf("['%s' (%d)]\n", node->key, - ((SoundInfo *)node->content)->num_references); - node = node->next; - } - - printf("[%d nodes]\n", getNumNodes(node_first)); -} - -static void LoadSoundsInfo() -{ - char *filename = getCustomSoundConfigFilename(); - struct SetupFileList *setup_file_list; - int i; - -#if 0 - printf("GOT CUSTOM SOUND CONFIG FILE '%s'\n", filename); -#endif - - /* always start with reliable default values */ - for (i=0; i '%s'\n", sound_effect[i].filename); - else - printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename); - } -#endif - } -} - static void ReloadCustomSounds() { - static boolean draw_init_text = TRUE; /* only draw at startup */ - int i; - #if 0 - printf("DEBUG: reloading sounds '%s' ...\n",artwork.sounds_set_current_name); + printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier); #endif - LoadSoundsInfo(); - - if (draw_init_text) - DrawInitText("Loading sounds:", 120, FC_GREEN); - -#if 0 - printf("DEBUG: reloading %d sounds ...\n", num_sounds); -#endif - - for(i=0; i