020-no_mpg123.patch (2936B)
1 --- a/Makefile 2 +++ b/Makefile 3 @@ -15,7 +15,7 @@ OPT_IR = -DIR 4 SOURCES = \ 5 main.c slimproto.c buffer.c stream.c utils.c \ 6 output.c output_alsa.c output_pa.c output_stdout.c output_pack.c decode.c \ 7 - flac.c pcm.c mad.c vorbis.c faad.c mpg.c 8 + flac.c pcm.c mad.c vorbis.c faad.c 9 10 SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c 11 SOURCES_FF = ffmpeg.c 12 @@ -25,7 +25,7 @@ SOURCES_IR = ir.c 13 14 LINK_LINUX = -ldl 15 16 -LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123 17 +LINKALL = -lFLAC -lmad -lvorbisfile -lfaad 18 LINKALL_FF = -lavcodec -lavformat -lavutil 19 LINKALL_RESAMPLE = -lsoxr 20 LINKALL_IR = -llirc_client 21 --- a/decode.c 22 +++ b/decode.c 23 @@ -147,8 +147,8 @@ void decode_init(log_level level, const 24 // try mad then mpg for mp3 unless command line option passed 25 if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) && 26 (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad(); 27 - if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] && 28 - (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg(); 29 +// if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] && 30 +// (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg(); 31 32 mutex_create(decode.mutex); 33 34 --- a/main.c 35 +++ b/main.c 36 @@ -39,7 +39,8 @@ 37 #else 38 #define CODECS_DSD "" 39 #endif 40 -#define CODECS_MP3 " (mad,mpg for specific mp3 codec)" 41 +//#define CODECS_MP3 " (mad,mpg for specific mp3 codec)" 42 +#define CODECS_MP3 " (mad for specific mp3 codec)" 43 44 #define CODECS CODECS_BASE CODECS_FF CODECS_DSD CODECS_MP3 45 46 --- a/squeezelite.h 47 +++ b/squeezelite.h 48 @@ -155,7 +155,7 @@ 49 #if LINUX 50 #define LIBFLAC "libFLAC.so.8" 51 #define LIBMAD "libmad.so.0" 52 -#define LIBMPG "libmpg123.so.0" 53 +//#define LIBMPG "libmpg123.so.0" 54 #define LIBVORBIS "libvorbisfile.so.3" 55 #define LIBTREMOR "libvorbisidec.so.1" 56 #define LIBFAAD "libfaad.so.2" 57 @@ -169,7 +169,7 @@ 58 #if OSX 59 #define LIBFLAC "libFLAC.8.dylib" 60 #define LIBMAD "libmad.0.dylib" 61 -#define LIBMPG "libmpg123.0.dylib" 62 +//#define LIBMPG "libmpg123.0.dylib" 63 #define LIBVORBIS "libvorbisfile.3.dylib" 64 #define LIBTREMOR "libvorbisidec.1.dylib" 65 #define LIBFAAD "libfaad.2.dylib" 66 @@ -182,7 +182,7 @@ 67 #if WIN 68 #define LIBFLAC "libFLAC.dll" 69 #define LIBMAD "libmad-0.dll" 70 -#define LIBMPG "libmpg123-0.dll" 71 +//#define LIBMPG "libmpg123-0.dll" 72 #define LIBVORBIS "libvorbisfile.dll" 73 #define LIBTREMOR "libvorbisidec.dll" 74 #define LIBFAAD "libfaad2.dll" 75 @@ -195,7 +195,7 @@ 76 #if FREEBSD 77 #define LIBFLAC "libFLAC.so.11" 78 #define LIBMAD "libmad.so.2" 79 -#define LIBMPG "libmpg123.so.0" 80 +//#define LIBMPG "libmpg123.so.0" 81 #define LIBVORBIS "libvorbisfile.so.6" 82 #define LIBTREMOR "libvorbisidec.so.1" 83 #define LIBFAAD "libfaad.so.2"