X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=16599411820313eae492a604fb58d09b1221b752;hp=a1374b7319b1e66167ab316c3ee03a588f5a8327;hb=5b972aabaf27931cae6ac318c9b920d33593f07b;hpb=203bfcadc14507f4d01f99099efec8ee976556b1

diff --git a/mp3dec.c b/mp3dec.c
index a1374b73..16599411 100644
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -1,22 +1,10 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file mp3dec.c paraslash's mp3 decoder */
+/** \file mp3dec.c Paraslash's mp3 decoder. */
 
 #include "para.h"
 #include "list.h"
@@ -26,25 +14,20 @@
 #include <mad.h>
 #include "string.h"
 
-/** the output buffer size */
-#define MP3_OUTBUF_SIZE 128 * 1024
+/** The output buffer size. */
+#define MP3_OUTBUF_SIZE (128 * 1024)
 
-/** \cond a helper macro */
+/** Convert a sample value from libmad to a signed short. */
 #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
 	(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
-/** \endcond */
 
-/**
- * data specific to the mp3dec filter
- *
- * \sa filter, filter_node
- */
+/** Data specific to the mp3dec filter. */
 struct private_mp3dec_data {
-	/** information on the current mp3 stream */
+	/** Information on the current mp3 stream. */
 	struct mad_stream stream;
-	/** information about the frame which is currently decoded */
+	/** Information about the frame which is currently decoded. */
 	struct mad_frame frame;
-	/** contains the PCM output */
+	/** Contains the PCM output. */
 	struct mad_synth synth;
 };
 
@@ -74,7 +57,7 @@ next_frame:
 	mad_synth_frame(&pmd->synth, &pmd->frame);
 
 	for (i = 0; i < pmd->synth.pcm.length; i++) {
-		signed short s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
+		int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
 		write_int16_host_endian(fn->buf + fn->loaded, s);
 		fn->loaded += 2;
 		if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
@@ -127,11 +110,11 @@ static void mp3dec_open(struct filter_node *fn)
 }
 
 /**
- * the init function of the mp3dec filter
+ * The init function of the mp3dec filter.
  *
- * \param f pointer to the filter struct to initialize
+ * \param f Pointer to the filter struct to initialize.
  *
- * \sa filter::init
+ * \sa filter::init.
  */
 void mp3dec_init(struct filter *f)
 {