X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=d31bc586cb5c9c8a46622eb6aca0f219ecaa4d9b;hb=28f0f8708f4b4f8c4f39f1b23bc5fc7e0fed7579;hp=e98c42a2d2056b2977958837e1acf1cb957dcc2a;hpb=838825e11f7e4af0947bf9d40061defd4e499017;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index e98c42a2..d31bc586 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -152,22 +152,9 @@ 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 ArtworkListInfo sound_info; - -static struct SoundEffectInfo *sound_effect; +static struct ArtworkConfigInfo *sound_config = NULL; static ListNode *SoundFileList = NULL; static SoundInfo **Sound = NULL; static MusicInfo **Music = NULL; @@ -273,6 +260,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 @@ -498,8 +491,10 @@ static void WriteReloadInfoToPipe(char *set_identifier, int type) 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); @@ -530,12 +525,20 @@ static void WriteReloadInfoToPipe(char *set_identifier, 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,7 +551,7 @@ 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; + 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 : @@ -561,10 +564,15 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) 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) @@ -583,19 +591,29 @@ 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) @@ -1519,7 +1537,7 @@ static int ulaw_to_linear(unsigned char ulawbyte) #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ #define WAV_HEADER_SIZE 16 /* size of WAV file header */ -static SoundInfo *Load_WAV(char *filename) +static void *Load_WAV(char *filename) { SoundInfo *snd_info; #if defined(AUDIO_UNIX_NATIVE) @@ -1793,13 +1811,21 @@ static void LoadCustomSound(SoundInfo **snd_info, char *basename) replaceSoundEntry(snd_info, filename); } -void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) +void InitSoundList(struct ArtworkConfigInfo *config_list, int num_list_entries) { if (Sound == NULL) Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); - sound_effect = sounds_list; + sound_config = config_list; num_sounds = num_list_entries; + + 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; } void LoadSoundToList(char *basename, int list_pos) @@ -1861,7 +1887,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 +1909,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,129 +2048,22 @@ 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) +#if 1 +static void ReloadCustomSounds() { - 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)); + ReloadCustomArtworkFiles(&sound_info); } - -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 - } -} - +#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.sounds_set_current_name); + printf("DEBUG: reloading sounds '%s' ...\n",artwork.snd_current_identifier); #endif - LoadSoundsInfo(); + LoadArtworkConfig(&sound_info); if (draw_init_text) DrawInitText("Loading sounds:", 120, FC_GREEN); @@ -2150,12 +2075,12 @@ static void ReloadCustomSounds() for(i=0; i