From 2d39af8604e7e9ce9ca25d23ca1a827815219478 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 7 Aug 2020 16:44:16 -0400 Subject: [PATCH] Remove all this unused playlist related code --- src/s_sound.c | 21 --------------------- src/s_sound.h | 11 ----------- 2 files changed, 32 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 2eeecadd5..11673b5e0 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -294,27 +294,6 @@ void S_RegisterSoundStuff(void) COM_AddCommand("tunes", Command_Tunes_f); COM_AddCommand("restartaudio", Command_RestartAudio_f); - -#if defined (macintosh) && !defined (HAVE_SDL) // mp3 playlist stuff - { - INT32 i; - for (i = 0; i < PLAYLIST_LENGTH; i++) - { - user_songs[i].name = malloc(7); - if (!user_songs[i].name) - I_Error("No more free memory for mp3 playlist"); - sprintf(user_songs[i].name, "song%d%d",i/10,i%10); - user_songs[i].defaultvalue = malloc(sizeof (char)); - if (user_songs[i].defaultvalue) - I_Error("No more free memory for blank mp3 playerlist"); - *user_songs[i].defaultvalue = 0; - user_songs[i].flags = CV_SAVE; - user_songs[i].PossibleValue = NULL; - CV_RegisterVar(&user_songs[i]); - } - CV_RegisterVar(&play_mode); - } -#endif } static void SetChannelsNum(void) diff --git a/src/s_sound.h b/src/s_sound.h index 744065754..c874f4358 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -65,17 +65,6 @@ extern CV_PossibleValue_t soundvolume_cons_t[]; //part of i_cdmus.c extern consvar_t cd_volume, cdUpdate; -#if defined (macintosh) && !defined (HAVE_SDL) -typedef enum -{ - music_normal, - playlist_random, - playlist_normal -} playmode_t; - -extern consvar_t play_mode; -#endif - typedef enum { SF_TOTALLYSINGLE = 1, // Only play one of these sounds at a time...GLOBALLY