mp3lib: drop internal mp3lib tree

Delete mp3lib which has been the default mp3 decoder until now. In
addition to being an unnecessary embedded library it now fails to
compile correctly with the new gcc-4.6, producing noise.

After the deletion the default decoder priority for mp3 will be first
libmpg123 (a newer version of the code that mp3lib was based on) if
available, then ffmp3float which should be available in all normal
compiles. I think that some tweaking may be required as these decoder
alternatives get wider testing, but any problems should be solvable
and there should be no need for mp3lib.

1 files changed, 0 insertions, 87 deletions

diff --git a/mp3lib/test2.c b/mp3lib/test2.c
deleted file mode 100644
index ccedbecdbd..0000000000
--- a/mp3lib/test2.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/soundcard.h>
-
-#include "config.h"
-#include "mp3lib/mp3.h"
-#include "cpudetect.h"
-
-static FILE* mp3file=NULL;
-
-int mplayer_audio_read(char *buf,int size){
-    return fread(buf,1,size,mp3file);
-}
-
-#define BUFFLEN 4608
-static unsigned char buffer[BUFFLEN];
-
-
-int main(int argc,char* argv[]){
-  int len;
-  int total=0;
-  int r;
-  int audio_fd;
-
-  mp3file=fopen((argc>1)?argv[1]:"test.mp3","rb");
-  if(!mp3file){  printf("file not found\n");  exit(1); }
-
-  GetCpuCaps(&gCpuCaps);
-
-  // MPEG Audio:
-#ifdef CONFIG_FAKE_MONO
-  MP3_Init(0);
-#else
-  MP3_Init();
-#endif
-  MP3_samplerate=MP3_channels=0;
-  len=MP3_DecodeFrame(buffer,-1);
-
-  audio_fd=open("/dev/dsp", O_WRONLY);
-  if(audio_fd<0){  printf("Can't open audio device\n");exit(1); }
-  r=AFMT_S16_LE;ioctl (audio_fd, SNDCTL_DSP_SETFMT, &r);
-  r=MP3_channels-1;ioctl (audio_fd, SNDCTL_DSP_STEREO, &r);
-  r=MP3_samplerate;ioctl (audio_fd, SNDCTL_DSP_SPEED, &r);
-  printf("audio_setup: using %d Hz samplerate (requested: %d)\n",r,MP3_samplerate);
-
-  while(1){
-      int len2;
-      if(len==0) len=MP3_DecodeFrame(buffer,-1);
-      if(len<=0) break; // EOF
-
-      // play it
-      len2=write(audio_fd,buffer,len);
-      if(len2<0) break; // ERROR?
-      len-=len2; total+=len2;
-      if(len>0){
-          // this shouldn't happen...
-          memcpy(buffer,buffer+len2,len);
-          putchar('!');fflush(stdout);
-      }
-  }
-
-  fclose(mp3file);
-  return 0;
-}