qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 07:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

ashridah's cd info patch with some whitespace and string handling tweaks

Browse source
This commit is contained in:
Bill Currie 2004-02-07 05:46:43 +00:00
parent 7ae804b8cf
commit eee61d261c
1 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libs/audio/cd/cd_file.c
View file

@ -267,7 +267,7 @@ I_OGGMus_Resume (void)
playing = true; playing = true;
} }
/* print out the current track map. */ /* print out the current track map, in numerical order. */
static void static void
I_OGGMus_Info (void) I_OGGMus_Info (void)
{ {
@ -275,6 +275,10 @@ I_OGGMus_Info (void)
plitem_t *currentmap = NULL; plitem_t *currentmap = NULL;
plitem_t *currenttrack = NULL; plitem_t *currenttrack = NULL;
int iter = 0; int iter = 0;
int count = 0;
int highesttrack = 0;
const char *trackstring;
char **mapoutput = NULL;
if (!tracklist) { if (!tracklist) {
Sys_Printf ("\n" "No Tracklist\n" "------------\n"); Sys_Printf ("\n" "No Tracklist\n" "------------\n");
@ -291,22 +295,57 @@ I_OGGMus_Info (void)
Sys_Printf ("\n" "Tracklist loaded from file:\n%s\n" Sys_Printf ("\n" "Tracklist loaded from file:\n%s\n"
"---------------------------\n", mus_ogglist->string); "---------------------------\n", mus_ogglist->string);
/* loop through the list with PL_ObjectAtIndex () */ /* loop, and count up the Highest key number. */
for (iter = 0; iter < ((plarray_t *) (keylist->data))->numvals; iter++) { for (iter = 0; iter < ((plarray_t *) (keylist->data))->numvals; iter++) {
if (!(currentmap = PL_ObjectAtIndex (keylist, iter))) { if (!(currentmap = PL_ObjectAtIndex (keylist, iter))) {
Sys_DPrintf ("OGGMus: No track for track number %i.\n", iter); Sys_DPrintf ("OGGMus: No track for track index %i.\n", iter);
continue; continue;
} }
if (currentmap->type != QFString) { if (currentmap->type != QFString) {
Sys_DPrintf ("OGGMus: Track data isn't a string for: %i\n", iter); Sys_DPrintf ("OGGMus: Track data isn't a string for: %i\n", iter);
continue; continue;
} }
currenttrack = PL_ObjectForKey (tracklist, (char *) currentmap->data); if (highesttrack < strtol ((char *) currentmap->data, NULL, 10) )
Sys_Printf (" %s - %s\n", (char *) currentmap->data, highesttrack = strtol ((char *) currentmap->data, NULL, 10);
(char *) currenttrack->data);
} }
Sys_DPrintf ("Highest Track number = %i.\n", highesttrack);
/* allocate a null terminated array of char *'s */
mapoutput = calloc (highesttrack + 1, sizeof (char*));
if (!mapoutput)
Sys_Error ("couldn't allocate mapoutput array!\n");
/* loop until we've extracted 'numval' trackmaps, or hit the highest track
* number */
for (iter = 0, count = 0;
(iter < ((plarray_t *) keylist->data)->numvals
|| count <= highesttrack);
count++)
{
trackstring = va ("%i", count);
if (!(currenttrack = PL_ObjectForKey (tracklist, trackstring)))
{
Sys_DPrintf ("Skipping trackstring: %s.\n", trackstring);
continue;
}
mapoutput[iter] = nva (" %s - %s", trackstring,
(char*) currenttrack->data);
if (!mapoutput[iter])
Sys_Error ("I_OGGMus: couldn't allocate mapstring!\n");
iter++;
}
/* output the map, and delete the allocated strings */
for (iter = 0; (iter < ((plarray_t *) (keylist->data))->numvals); iter++)
{
Sys_Printf ("%s\n", mapoutput[iter]);
free (mapoutput[iter]);
}
free (mapoutput);
PL_Free (keylist); PL_Free (keylist);
} }