From a3c29bc44a48dcd1aac1c56dcb2745643db7e15f Mon Sep 17 00:00:00 2001
From: beveloper <beveloper@nowhere.fake>
Date: Sat, 29 Nov 2003 13:28:35 +0000
Subject: [PATCH] cleanup

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5496 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../media/plugins/mp3_decoder/mpglib/CHANGES  |  7 ++++
 .../media/plugins/mp3_decoder/mpglib/mpg123.h | 36 +------------------
 .../media/plugins/mp3_decoder/mpglib/mpglib.h |  8 ++---
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/src/add-ons/media/plugins/mp3_decoder/mpglib/CHANGES b/src/add-ons/media/plugins/mp3_decoder/mpglib/CHANGES
index 2c2c292b12..95d99ff87e 100644
--- a/src/add-ons/media/plugins/mp3_decoder/mpglib/CHANGES
+++ b/src/add-ons/media/plugins/mp3_decoder/mpglib/CHANGES
@@ -6,3 +6,10 @@
   - modified for usage with OpenBeOS
   - removed global variable struct mpstr *gmp
   - moved initialization into separate function
+
+25/Nov/2003: (by Marcus Overhagen)
+  - removed global variables bitindex and wordpointer
+  - cleanup
+
+29/Nov/2003: (by Marcus Overhagen)
+  - cleanup
diff --git a/src/add-ons/media/plugins/mp3_decoder/mpglib/mpg123.h b/src/add-ons/media/plugins/mp3_decoder/mpglib/mpg123.h
index 0d00261489..4b5cdc11d9 100644
--- a/src/add-ons/media/plugins/mp3_decoder/mpglib/mpg123.h
+++ b/src/add-ons/media/plugins/mp3_decoder/mpglib/mpg123.h
@@ -29,7 +29,6 @@
 
 #define         SCALE_BLOCK             12
 
-
 #define         MPG_MD_STEREO           0
 #define         MPG_MD_JOINT_STEREO     1
 #define         MPG_MD_DUAL_CHANNEL     2
@@ -67,7 +66,7 @@ struct frame {
 extern unsigned int   get1bit(struct mpstr *mp);
 extern unsigned int   getbits(struct mpstr *mp, int);
 extern unsigned int   getbits_fast(struct mpstr *mp, int);
-extern int set_pointer(struct mpstr *mp, long backstep);
+extern int            set_pointer(struct mpstr *mp, long backstep);
 
 extern void make_decode_tables(long scaleval);
 extern int do_layer3(struct mpstr *mp, struct frame *fr,unsigned char *,int *);
@@ -75,8 +74,6 @@ extern int do_layer2(struct mpstr *mp, struct frame *fr,unsigned char *,int *);
 extern int do_layer1(struct mpstr *mp, struct frame *fr,unsigned char *,int *);
 extern int decode_header(struct frame *fr,unsigned long newhead);
 
-
-
 struct gr_info_s {
       int scfsi;
       unsigned part2_3_length;
@@ -108,44 +105,13 @@ struct III_sideinfo
 };
 
 extern int synth_1to1 (struct mpstr *mp, real *,int,unsigned char *,int *);
-extern int synth_1to1_8bit (real *,int,unsigned char *,int *);
 extern int synth_1to1_mono (struct mpstr *mp, real *,unsigned char *,int *);
-extern int synth_1to1_mono2stereo (real *,unsigned char *,int *);
-extern int synth_1to1_8bit_mono (real *,unsigned char *,int *);
-extern int synth_1to1_8bit_mono2stereo (real *,unsigned char *,int *);
-
-extern int synth_2to1 (real *,int,unsigned char *,int *);
-extern int synth_2to1_8bit (real *,int,unsigned char *,int *);
-extern int synth_2to1_mono (real *,unsigned char *,int *);
-extern int synth_2to1_mono2stereo (real *,unsigned char *,int *);
-extern int synth_2to1_8bit_mono (real *,unsigned char *,int *);
-extern int synth_2to1_8bit_mono2stereo (real *,unsigned char *,int *);
-
-extern int synth_4to1 (real *,int,unsigned char *,int *);
-extern int synth_4to1_8bit (real *,int,unsigned char *,int *);
-extern int synth_4to1_mono (real *,unsigned char *,int *);
-extern int synth_4to1_mono2stereo (real *,unsigned char *,int *);
-extern int synth_4to1_8bit_mono (real *,unsigned char *,int *);
-extern int synth_4to1_8bit_mono2stereo (real *,unsigned char *,int *);
-
-extern int synth_ntom (real *,int,unsigned char *,int *);
-extern int synth_ntom_8bit (real *,int,unsigned char *,int *);
-extern int synth_ntom_mono (real *,unsigned char *,int *);
-extern int synth_ntom_mono2stereo (real *,unsigned char *,int *);
-extern int synth_ntom_8bit_mono (real *,unsigned char *,int *);
-extern int synth_ntom_8bit_mono2stereo (real *,unsigned char *,int *);
-
-extern void rewindNbits(int bits);
-extern int  hsstell(void);
-extern int get_songlen(struct frame *fr,int no);
 
 extern void init_layer3(int);
 extern void init_layer2(void);
 extern void make_decode_tables(long scale);
-extern void make_conv16to8_table(int);
 extern void dct64(real *,real *,real *);
 
-extern unsigned char *conv16to8;
 extern long freqs[9];
 extern real muls[27][64];
 extern real decwin[512+32];
diff --git a/src/add-ons/media/plugins/mp3_decoder/mpglib/mpglib.h b/src/add-ons/media/plugins/mp3_decoder/mpglib/mpglib.h
index d3e97be83e..c3739e3195 100644
--- a/src/add-ons/media/plugins/mp3_decoder/mpglib/mpglib.h
+++ b/src/add-ons/media/plugins/mp3_decoder/mpglib/mpglib.h
@@ -4,11 +4,11 @@
 #include "mpg123.h"
 
 struct buf {
-        unsigned char *pnt;
+	unsigned char *pnt;
 	long size;
 	long pos;
-        struct buf *next;
-        struct buf *prev;
+	struct buf *next;
+	struct buf *prev;
 };
 
 struct framebuf {
@@ -46,7 +46,7 @@ extern "C" {
 void InitMpgLib(void);  
 void InitMP3(struct mpstr *mp);
 int decodeMP3(struct mpstr *mp,char *inmemory,int inmemsize,
-     char *outmemory,int outmemsize,int *done);
+              char *outmemory,int outmemsize,int *done);
 void ExitMP3(struct mpstr *mp);
 
 #ifdef __cplusplus