diff --git a/src/s_sound.h b/src/s_sound.h index 080283822..66718194a 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -178,6 +178,15 @@ boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi); // Set Speed of Music boolean S_SpeedMusic(float speed); +// Music credits +typedef struct musicdef_s +{ + char name[7]; + //char usage[256]; + char source[256]; + struct musicdef_s *next; +} musicdef_t; + extern struct cursongcredit { musicdef_t *def; @@ -192,35 +201,6 @@ void S_LoadMusicDefs(UINT16 wadnum); void S_InitMusicDefs(void); void S_ShowMusicCredit(void); -// Music definitions -typedef struct musicdef_s -{ - char name[7]; - char title[32]; - char alttitle[64]; - char authors[256]; - char usage[256]; -- probably never going to be relevant to vanilla - char source[256]; - UINT8 soundtestpage; - INT16 soundtestcond; // +ve for map, -ve for conditionset, 0 for already here - tic_t stoppingtics; - fixed_t bpm; - UINT32 loop_ms;/* override LOOPPOINT/LOOPMS */ - boolean allowed; // question marks or listenable on sound test? - struct musicdef_s *next; -} musicdef_t; - -extern musicdef_t soundtestsfx; -extern musicdef_t *musicdefstart; -extern musicdef_t **soundtestdefs; -extern INT32 numsoundtestdefs; -extern UINT8 soundtestpage; - -void S_LoadMusicDefs(UINT16 wadnum); -void S_InitMusicDefs(void); - -boolean S_PrepareSoundTest(void); - // // Music Seeking //