Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
audio: remove internal libmpg123 wrapper
We've been prefering the libavcodec mp3 decoder for half a year now.
There is likely no benefit at all for using the libmpg123 one. It's just
a maintenance burden, and tricks users into thinking it's a required
dependency.
  • Loading branch information
wm4 committed Mar 24, 2015
1 parent 170a2e0 commit d5318e5
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 319 deletions.
304 changes: 0 additions & 304 deletions audio/decode/ad_mpg123.c

This file was deleted.

5 changes: 0 additions & 5 deletions audio/decode/dec_audio.c
Expand Up @@ -25,7 +25,6 @@

#include "demux/codec_tags.h"

#include "config.h"
#include "common/codecs.h"
#include "common/msg.h"
#include "misc/bstr.h"
Expand All @@ -43,15 +42,11 @@

#include "audio/filter/af.h"

extern const struct ad_functions ad_mpg123;
extern const struct ad_functions ad_lavc;
extern const struct ad_functions ad_spdif;

static const struct ad_functions * const ad_drivers[] = {
&ad_lavc,
#if HAVE_MPG123
&ad_mpg123,
#endif
&ad_spdif,
NULL
};
Expand Down
3 changes: 0 additions & 3 deletions old-configure
Expand Up @@ -187,7 +187,6 @@ options_state_machine() {
opt_yes_no _ffmpeg "skip FFmpeg/Libav autodetection"
opt_yes_no _ladspa "LADSPA plugin support"
opt_yes_no _libbs2b "libbs2b audio filter support"
opt_yes_no _mpg123 " libmpg123 MP3 decoding support"
opt_yes_no _libavresample "libavresample (preferred over libswresample)"
opt_yes_no _libswresample "libswresample"
opt_yes_no _caca "CACA video output"
Expand Down Expand Up @@ -737,8 +736,6 @@ check_pkg_config "ENCA" $_enca ENCA 'enca'
check_pkg_config "zlib" auto ZLIB 'zlib'
test $(defretval) = no && die "Unable to find development files for zlib."

check_pkg_config "mpg123 support" $_mpg123 MPG123 'libmpg123 >= 1.14.0'

test "$_dl" = no && _ladspa=no
check_statement_libs "LADSPA plugin support" $_ladspa LADSPA ladspa.h 'LADSPA_Descriptor ld = {0}'

Expand Down
2 changes: 0 additions & 2 deletions old-makefile
Expand Up @@ -45,8 +45,6 @@ SOURCES-$(LIBBS2B) += audio/filter/af_bs2b.c

SOURCES-$(LIBSMBCLIENT) += stream/stream_smb.c

SOURCES-$(MPG123) += audio/decode/ad_mpg123.c

SOURCES-$(PVR) += stream/stream_pvr.c

SOURCES-$(TV) += stream/stream_tv.c stream/tv.c \
Expand Down
4 changes: 0 additions & 4 deletions wscript
Expand Up @@ -338,10 +338,6 @@ iconv support use --disable-iconv.",
'name': '--enca',
'desc': 'ENCA support',
'func': check_statement('enca.h', 'enca_get_languages(NULL)', lib='enca'),
}, {
'name': '--mpg123',
'desc': 'mpg123 support',
'func': check_pkg_config('libmpg123', '>= 1.14.0'),
}, {
'name': '--ladspa',
'desc': 'LADSPA plugin support',
Expand Down
1 change: 0 additions & 1 deletion wscript_build.py
Expand Up @@ -90,7 +90,6 @@ def build(ctx):
( "audio/format.c" ),
( "audio/mixer.c" ),
( "audio/decode/ad_lavc.c" ),
( "audio/decode/ad_mpg123.c", "mpg123" ),
( "audio/decode/ad_spdif.c" ),
( "audio/decode/dec_audio.c" ),
( "audio/filter/af.c" ),
Expand Down

0 comments on commit d5318e5

Please sign in to comment.