diff --git a/src/audio_dec/Makefile.am b/src/audio_dec/Makefile.am --- a/src/audio_dec/Makefile.am +++ b/src/audio_dec/Makefile.am @@ -5,10 +5,6 @@ AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = fooaudio.c noinst_HEADERS = ff_dvdata.h - -if ENABLE_MUSEPACK -musepack_module = xineplug_decode_mpc.la -endif if ENABLE_DTS dts_module = xineplug_decode_dts.la @@ -35,9 +31,6 @@ endif $(top_builddir)/contrib/libmad/libmad.la: $(MAKE) -C $(top_builddir)/contrib/libmad -$(top_builddir)/contrib/libmpcdec/libmpcdec.la: - $(MAKE) -C $(top_builddir)/contrib/libmpcdec - $(top_builddir)/contrib/libdca/libdca.la: $(MAKE) -C $(top_builddir)/contrib/libdca @@ -60,11 +53,6 @@ xineplug_decode_gsm610_la_CPPFLAGS = -I$ xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) - -xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c -xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS) -xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(MPCDEC_LIBS) -xineplug_decode_mpc_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS) xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS) diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -9,6 +9,10 @@ xineplug_wavpack = xineplug_wavpack.la xineplug_wavpack = xineplug_wavpack.la endif +if ENABLE_MUSEPACK +xineplug_musepack = xineplug_musepack.la +endif + if ENABLE_NOSEFART xineplug_nsf = xineplug_nsf.la endif @@ -17,11 +21,15 @@ xineplug_flac = xineplug_flac.la xineplug_flac = xineplug_flac.la endif +$(top_builddir)/contrib/libmpcdec/libmpcdec.la: + $(MAKE) -C $(top_builddir)/contrib/libmpcdec + $(top_builddir)/contrib/nosefart/libnosefart.la: $(MAKE) -C $(top_builddir)/contrib/nosefart xineplug_LTLIBRARIES = \ $(xineplug_wavpack) \ + $(xineplug_musepack) \ $(xineplug_flac) \ $(xineplug_nsf) @@ -29,6 +37,11 @@ xineplug_wavpack_la_LIBADD = $(XINE_LIB) xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS) xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS) xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers + +xineplug_musepack_la_SOURCES = mpc_decoder.c mpc_demuxer.c +xineplug_musepack_la_DEPENDENCIES = $(MPCDEC_DEPS) +xineplug_musepack_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(MPCDEC_LIBS) +xineplug_musepack_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS) xineplug_flac_la_SOURCES = flac_demuxer.c flac_decoder.c xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS) diff --git a/src/audio_dec/xine_musepack_decoder.c b/src/combined/mpc_decoder.c rename from src/audio_dec/xine_musepack_decoder.c rename to src/combined/mpc_decoder.c --- a/src/audio_dec/xine_musepack_decoder.c +++ b/src/combined/mpc_decoder.c @@ -444,6 +444,12 @@ static void *init_plugin (xine_t *xine, return this; } +extern void *demux_mpc_init_plugin (xine_t *, void *); + +static const demuxer_info_t demux_info_mpc = { + 1 /* priority */ +}; + static const uint32_t audio_types[] = { BUF_AUDIO_MPC, 0 @@ -456,6 +462,7 @@ static const decoder_info_t dec_info_aud const plugin_info_t xine_plugin_info[] EXPORTED = { /* { type, API version, "name", version, special_info, init_function }, */ + { PLUGIN_DEMUX, 27, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin }, { PLUGIN_AUDIO_DECODER, 16, "mpc", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpc.c b/src/combined/mpc_demuxer.c rename from src/demuxers/demux_mpc.c rename to src/combined/mpc_demuxer.c --- a/src/demuxers/demux_mpc.c +++ b/src/combined/mpc_demuxer.c @@ -46,7 +46,6 @@ #include #include #include "bswap.h" -#include "group_audio.h" #include "id3.h" /* Note that the header is actually 25 bytes long, so we'd only read 28 diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -113,8 +113,7 @@ xineplug_dmx_audio_la_SOURCES = group_au demux_realaudio.c demux_snd.c demux_voc.c \ demux_vox.c demux_wav.c demux_ac3.c id3.c \ demux_aac.c demux_flac.c \ - demux_mpc.c demux_dts.c demux_shn.c \ - demux_tta.c + demux_tta.c demux_dts.c demux_shn.c xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) xineplug_dmx_modplug_la_SOURCES = demux_mod.c diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -65,10 +65,6 @@ static const demuxer_info_t demux_info_m 0 /* priority */ }; -static const demuxer_info_t demux_info_mpc = { - 1 /* priority */ -}; - static const demuxer_info_t demux_info_realaudio = { 10 /* priority */ }; @@ -107,7 +103,6 @@ const plugin_info_t xine_plugin_info[] E { PLUGIN_DEMUX, 27, "dts", XINE_VERSION_CODE, &demux_info_dts, demux_dts_init_plugin }, { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin }, { PLUGIN_DEMUX, 27, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class }, - { PLUGIN_DEMUX, 27, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin }, { PLUGIN_DEMUX, 27, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin }, { PLUGIN_DEMUX, 27, "shn", XINE_VERSION_CODE, &demux_info_shn, demux_shn_init_plugin }, { PLUGIN_DEMUX, 27, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin }, diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -31,7 +31,6 @@ void *demux_dts_init_plugin (xine_t *xin void *demux_dts_init_plugin (xine_t *xine, void *data); void *demux_flac_init_plugin (xine_t *xine, void *data); void *demux_mpgaudio_init_class (xine_t *xine, void *data); -void *demux_mpc_init_plugin (xine_t *xine, void *data); void *demux_realaudio_init_plugin (xine_t *xine, void *data); void *demux_shn_init_plugin (xine_t *xine, void *data); void *demux_snd_init_plugin (xine_t *xine, void *data);