diff --git a/src/m_menu.c b/src/m_menu.c index 2fb38a4d5..9e9fbe1c9 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8458,7 +8458,7 @@ static void M_MusicTest(INT32 choice) { (void)choice; - if (!S_PrepareSoundTest()) + if (!nummusicdefs) { M_StartMessage(M_GetText("No selectable tracks found.\n"),NULL,MM_NOTHING); return; @@ -8537,33 +8537,33 @@ static void M_DrawMusicTest(void) { INT32 t, b, q, m = 128; - if (numsoundtestdefs <= 8) + if (nummusicdefs <= 8) { t = 0; - b = numsoundtestdefs - 1; + b = nummusicdefs - 1; i = 0; } else { q = m; - m = (5*m)/numsoundtestdefs; + m = (5*m)/nummusicdefs; if (st_sel < 3) { t = 0; b = 7; i = 0; } - else if (st_sel >= numsoundtestdefs-4) + else if (st_sel >= nummusicdefs-4) { - t = numsoundtestdefs - 8; - b = numsoundtestdefs - 1; + t = nummusicdefs - 8; + b = nummusicdefs - 1; i = q-m; } else { t = st_sel - 3; b = st_sel + 4; - i = (t * (q-m))/(numsoundtestdefs - 8); + i = (t * (q-m))/(nummusicdefs - 8); } } @@ -8572,7 +8572,7 @@ static void M_DrawMusicTest(void) if (t != 0) V_DrawString(20+280+4, 60+4 - (skullAnimCounter/5), V_YELLOWMAP, "\x1A"); - if (b != numsoundtestdefs - 1) + if (b != nummusicdefs - 1) V_DrawString(20+280+4, 60+128-12 + (skullAnimCounter/5), V_YELLOWMAP, "\x1B"); x = 24; @@ -8586,8 +8586,9 @@ static void M_DrawMusicTest(void) V_DrawFill(20, y-4, 280-1, 16, 237); { + const musicdef_t *def = S_GetMusicCredit(t); const size_t MAXLENGTH = 34; - const char *songname = soundtestdefs[t]->title[0] ? soundtestdefs[t]->title : soundtestdefs[t]->source; + const char *songname = def->title[0] ? def->title : def->source; size_t namelength = strlen(songname); @@ -8600,7 +8601,7 @@ static void M_DrawMusicTest(void) buf[MAXLENGTH] = 0; V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf); - if (curplaying == soundtestdefs[t]) + if (curplaying == def) { V_DrawFill(20+280-9, y-4, 8, 16, 230); } @@ -8618,7 +8619,7 @@ static void M_HandleMusicTest(INT32 choice) switch (choice) { case KEY_DOWNARROW: - if (st_sel++ >= numsoundtestdefs-1) + if (st_sel++ >= nummusicdefs-1) st_sel = 0; { S_StartSound(NULL, sfx_menu1); @@ -8627,18 +8628,18 @@ static void M_HandleMusicTest(INT32 choice) break; case KEY_UPARROW: if (!st_sel--) - st_sel = numsoundtestdefs-1; + st_sel = nummusicdefs-1; { S_StartSound(NULL, sfx_menu1); } st_musictime = 0; break; case KEY_PGDN: - if (st_sel < numsoundtestdefs-1) + if (st_sel < nummusicdefs-1) { st_sel += 3; - if (st_sel >= numsoundtestdefs-1) - st_sel = numsoundtestdefs-1; + if (st_sel >= nummusicdefs-1) + st_sel = nummusicdefs-1; S_StartSound(NULL, sfx_menu1); } st_musictime = 0; @@ -8672,7 +8673,7 @@ static void M_HandleMusicTest(INT32 choice) case KEY_ENTER: S_StopSounds(); S_StopMusic(); - curplaying = soundtestdefs[st_sel]; + curplaying = S_GetMusicCredit(st_sel); S_ChangeMusicInternal(curplaying->name, true); break; @@ -8681,9 +8682,6 @@ static void M_HandleMusicTest(INT32 choice) } if (exitmenu) { - Z_Free(soundtestdefs); - soundtestdefs = NULL; - if (currentMenu->prevMenu) M_SetupNextMenu(currentMenu->prevMenu); else diff --git a/src/s_sound.c b/src/s_sound.c index ab9a1a2d7..e4f15333f 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1203,8 +1203,58 @@ static consvar_t *music_refade_cv; /// Music Definitions /// ------------------------ -musicdef_t *musicdefstart = NULL; // First music definition -struct cursongcredit cursongcredit; // Currently displayed song credit info +// Similar system to vissprite allocation. Exists so external pointers to musicdefs are not invalidated +// when allocating more space for musicdefs +#define MUSICDEFCHUNKBITS 6 +#define MUSICDEFSPERCHUNK (1 << MUSICDEFCHUNKBITS) +#define MUSICDEFINDEXMASK (MUSICDEFSPERCHUNK - 1) +static musicdef_t **musicdefs = NULL; +static INT32 numchunks = 0; +INT32 nummusicdefs = 0; + +// +// S_GetMusicCredit +// +// Return music credit with given index. +// +musicdef_t *S_GetMusicCredit(INT32 i) +{ + if (i < 0 || i >= nummusicdefs) + return NULL; + + INT32 chunk = i >> MUSICDEFCHUNKBITS; + i &= MUSICDEFINDEXMASK; + + return &musicdefs[chunk][i]; +} + +// +// S_AddMusicCredit +// +// Return new music credit, allocates memory for it if needed. +// +static musicdef_t *S_AddMusicCredit(void) +{ + INT32 chunk = nummusicdefs >> MUSICDEFCHUNKBITS; + INT32 i = nummusicdefs & MUSICDEFINDEXMASK; + + // Allocate new chunk if needed. Other chunks stay valid + if (chunk == numchunks) + { + ++numchunks; + musicdefs = (musicdef_t**)Z_Realloc(musicdefs, sizeof(musicdef_t*)*numchunks, PU_STATIC, NULL); + musicdefs[chunk] = Z_Calloc(sizeof(musicdef_t)*MUSICDEFSPERCHUNK, PU_STATIC, NULL); + } + + // Store "id" of new musicdef (mostly exists only for lua) + musicdefs[chunk][i].num = nummusicdefs; + + ++nummusicdefs; + + return &musicdefs[chunk][i]; +} + +struct cursongcredit cursongcredit = {0}; // Currently displayed song credit info static boolean ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp) @@ -1232,14 +1282,11 @@ ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp) // Nothing found, add to the end. if (!def) { - def = Z_Calloc(sizeof (musicdef_t), PU_STATIC, NULL); + def = S_AddMusicCredit(); STRBUFCPY(def->name, value); strlwr(def->name); def->hash = quickncasehash (def->name, 6); - - def->next = musicdefstart; - musicdefstart = def; } (*defp) = def; @@ -1424,8 +1471,10 @@ musicdef_t *S_FindMusicCredit(const char *musname) UINT32 hash = quickncasehash (musname, 6); musicdef_t *def; - for (def = musicdefstart; def; def = def->next) + for (INT32 i = 0; i < nummusicdefs; ++i) { + def = S_GetMusicCredit(i); + if (hash != def->hash) continue; if (stricmp(def->name, musname)) @@ -1472,41 +1521,6 @@ void S_ShowMusicCredit(void) S_ShowSpecifiedMusicCredit(music.name); } -musicdef_t **soundtestdefs = NULL; -INT32 numsoundtestdefs = 0; - -// -// S_PrepareSoundTest -// -// Prepare sound test. What am I, your butler? -// -boolean S_PrepareSoundTest(void) -{ - musicdef_t *def; - INT32 pos = numsoundtestdefs = 0; - - for (def = musicdefstart; def; def = def->next) - { - numsoundtestdefs++; - } - - if (!numsoundtestdefs) - return false; - - if (soundtestdefs) - Z_Free(soundtestdefs); - - if (!(soundtestdefs = Z_Malloc(numsoundtestdefs*sizeof(musicdef_t *), PU_STATIC, NULL))) - I_Error("S_PrepareSoundTest(): could not allocate soundtestdefs."); - - for (def = musicdefstart; def /*&& i < numsoundtestdefs*/; def = def->next) - { - soundtestdefs[pos++] = def; - } - - return true; -} - /// ------------------------ /// Music Status /// ------------------------ diff --git a/src/s_sound.h b/src/s_sound.h index 92e206e1b..d909bf63d 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -182,14 +182,9 @@ typedef struct musicdef_s char alttitle[256]; char authors[256]; boolean use_info; - struct musicdef_s *next; + size_t num; } musicdef_t; -extern musicdef_t *musicdefstart; -extern musicdef_t **soundtestdefs; -extern INT32 numsoundtestdefs; -extern UINT8 soundtestpage; - extern struct cursongcredit { musicdef_t *def; @@ -198,17 +193,17 @@ extern struct cursongcredit UINT8 trans; } cursongcredit; +extern INT32 nummusicdefs; void S_LoadMusicDefs(UINT16 wadnum); void S_InitMusicDefs(void); void S_LoadMTDefs(UINT16 wadnum); void S_InitMTDefs(void); +musicdef_t *S_GetMusicCredit(INT32 i); musicdef_t *S_FindMusicCredit(const char *musname); void S_ShowSpecifiedMusicCredit(const char *musname); void S_ShowMusicCredit(void); -boolean S_PrepareSoundTest(void); - // // Music Seeking //