summaryrefslogtreecommitdiffstats
path: root/mp3lib/mp3.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-04-02 07:02:43 +0300
committerUoti Urpala <uau@mplayer2.org>2011-04-02 07:28:53 +0300
commitf9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202 (patch)
tree3d369fff359296307c05e120b4d2b53ea5974928 /mp3lib/mp3.h
parentb8e1456c25de18b8ecb8922d870bfe9161900d2a (diff)
downloadmpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.bz2
mpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.xz
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.
Diffstat (limited to 'mp3lib/mp3.h')
-rw-r--r--mp3lib/mp3.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/mp3lib/mp3.h b/mp3lib/mp3.h
deleted file mode 100644
index 3877f0169b..0000000000
--- a/mp3lib/mp3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* MP3 Player Library 2.0 (C) 1999 A'rpi/Astral&ESP-team */
-
-#ifndef MPLAYER_MP3LIB_MP3_H
-#define MPLAYER_MP3LIB_MP3_H
-
-/* decoder level: */
-#ifdef CONFIG_FAKE_MONO
-void MP3_Init(int fakemono);
-#else
-void MP3_Init(void);
-#endif
-int MP3_Open(char *filename, int buffsize);
-void MP3_SeekFrame(int num, int dir);
-void MP3_SeekForward(int num);
-int MP3_PrintTAG(void);
-int MP3_DecodeFrame(unsigned char *hova, short single);
-int MP3_FillBuffers(void);
-void MP3_PrintHeader(void);
-void MP3_Close(void);
-/* public variables: */
-extern int MP3_eof; // set if EOF reached
-extern int MP3_pause; // lock playing
-/* informational: */
-extern int MP3_filesize; // filesize
-extern int MP3_frames; // current frame no
-extern int MP3_fpos; // current file pos
-extern int MP3_framesize; // current framesize in bytes (including header)
-extern int MP3_bitrate; // current bitrate (kbits)
-extern int MP3_samplerate; // current sampling freq (Hz)
-extern int MP3_channels;
-extern int MP3_bps;
-
-/* player level: */
-int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */
-void MP3_Play(void);
-void MP3_Stop(void);
-void MP3_CloseDevice(void);
-
-#endif /* MPLAYER_MP3LIB_MP3_H */