You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

80 lines
2.8 KiB

  1. --- a/Makefile
  2. +++ b/Makefile
  3. @@ -22,7 +22,7 @@ OPT_OPUS = -DOPUS
  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 mpg.c
  8. + flac.c pcm.c vorbis.c mpg.c
  9. SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c
  10. SOURCES_FF = ffmpeg.c
  11. @@ -40,7 +40,7 @@ LINK_LINUX = -ldl
  12. LINK_SSL = -lssl -lcrypto
  13. LINK_ALAC = -lalac
  14. -LINKALL = -lmad -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg
  15. +LINKALL = -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg
  16. LINKALL_FF = -lavformat -lavcodec -lavutil
  17. LINKALL_RESAMPLE = -lsoxr
  18. LINKALL_IR = -llirc_client
  19. --- a/decode.c
  20. +++ b/decode.c
  21. @@ -184,11 +184,7 @@ void decode_init(log_level level, const
  22. if (!strstr(exclude_codecs, "pcm") && (!include_codecs || (order_codecs = strstr(include_codecs, "pcm"))))
  23. sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_pcm());
  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 || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mad"))))
  27. - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mad());
  28. - else if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) &&
  29. + if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) &&
  30. (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mpg"))))
  31. sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg());
  32. --- a/main.c
  33. +++ b/main.c
  34. @@ -51,7 +51,7 @@
  35. #else
  36. #define CODECS_DSD ""
  37. #endif
  38. -#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
  39. +#define CODECS_MP3 ""
  40. #define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_OPUS CODECS_DSD CODECS_MP3
  41. --- a/squeezelite.h
  42. +++ b/squeezelite.h
  43. @@ -190,7 +190,6 @@
  44. #if LINUX
  45. #define LIBFLAC "libFLAC.so.8"
  46. -#define LIBMAD "libmad.so.0"
  47. #define LIBMPG "libmpg123.so.0"
  48. #define LIBVORBIS "libvorbisfile.so.3"
  49. #define LIBOPUS "libopusfile.so.0"
  50. @@ -205,7 +204,6 @@
  51. #if OSX
  52. #define LIBFLAC "libFLAC.8.dylib"
  53. -#define LIBMAD "libmad.0.dylib"
  54. #define LIBMPG "libmpg123.0.dylib"
  55. #define LIBVORBIS "libvorbisfile.3.dylib"
  56. #define LIBTREMOR "libvorbisidec.1.dylib"
  57. @@ -219,7 +217,6 @@
  58. #if WIN
  59. #define LIBFLAC "libFLAC.dll"
  60. -#define LIBMAD "libmad-0.dll"
  61. #define LIBMPG "libmpg123-0.dll"
  62. #define LIBVORBIS "libvorbisfile.dll"
  63. #define LIBOPUS "libopusfile-0.dll"
  64. @@ -233,7 +230,6 @@
  65. #if FREEBSD
  66. #define LIBFLAC "libFLAC.so.8"
  67. -#define LIBMAD "libmad.so.0"
  68. #define LIBMPG "libmpg123.so.0"
  69. #define LIBVORBIS "libvorbisfile.so.3"
  70. #define LIBTREMOR "libvorbisidec.so.1"