X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=471efd99db36634e1db33763be94ef70c4ae6de4;hp=08837bec597918ed73fe27febbb0a42fbadf654e;hb=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hpb=7649f22106cec2c6eb8bb10f279401e1af5451d0 diff --git a/mp3_afh.c b/mp3_afh.c index 08837bec..471efd99 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2003 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2003 Andre Noll , see file COPYING. */ /** \file mp3_afh.c para_server's mp3 audio format handler */ @@ -67,8 +63,6 @@ static const int mp3info_bitrate[2][3][14] = { }; static const int frame_size_index[] = {24000, 72000, 72000}; -static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"}; - #ifdef HAVE_ID3TAG #include @@ -437,10 +431,13 @@ static int header_frequency(struct mp3header *h) return frequencies[h->version][h->freq]; } -static const char *header_mode(struct mp3header *h) +static const char *header_mode(const struct mp3header *h) { - if (h->mode > 4) - h->mode = 4; /* invalid */ + const char * const mode_text[] = {"stereo", "joint stereo", + "dual channel", "mono"}; + + if (h->mode >= ARRAY_SIZE(mode_text)) + return "invalid"; return mode_text[h->mode]; }