diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/Makefile.am | 6 | ||||
| -rw-r--r-- | src/demuxers/group_audio.c | 4 | ||||
| -rw-r--r-- | src/demuxers/group_audio.h | 5 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 9 |
4 files changed, 20 insertions, 4 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 83c29f4e3..1d2e41e38 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -11,6 +11,10 @@ if BUILD_ASF asf_module = xineplug_dmx_asf.la endif +if BUILD_NOSEFART +nsf_demuxer = demux_nsf.c +endif + if HAVE_LIBMNG mng_module = xineplug_dmx_mng.la endif @@ -104,7 +108,7 @@ xineplug_dmx_games_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_games_la_LDFLAGS = -avoid-version -module xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ - demux_cdda.c demux_mpgaudio.c demux_nsf.c \ + demux_cdda.c demux_mpgaudio.c $(nsf_demuxer) \ demux_realaudio.c demux_snd.c demux_voc.c \ demux_vox.c demux_wav.c demux_ac3.c id3.c \ demux_aac.c demux_mod.c demux_flac.c \ diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index bd3932b36..2643a8b80 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -69,9 +69,11 @@ static const demuxer_info_t demux_info_mpc = { 1 /* priority */ }; +#ifdef HAVE_NOSEFART static const demuxer_info_t demux_info_nsf = { 10 /* priority */ }; +#endif static const demuxer_info_t demux_info_realaudio = { 10 /* priority */ @@ -118,7 +120,9 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_DEMUX, 26, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin }, { PLUGIN_DEMUX, 26, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class }, { PLUGIN_DEMUX, 26, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin }, +#ifdef HAVE_NOSEFART { PLUGIN_DEMUX, 26, "nsf", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin }, +#endif { PLUGIN_DEMUX, 26, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin }, { PLUGIN_DEMUX, 26, "shn", XINE_VERSION_CODE, &demux_info_shn, demux_shn_init_plugin }, { PLUGIN_DEMUX, 26, "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 index 6b74d9feb..424e5c8e0 100644 --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -32,7 +32,6 @@ 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_nsf_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); @@ -41,6 +40,10 @@ void *demux_voc_init_plugin (xine_t *xine, void *data); void *demux_vox_init_plugin (xine_t *xine, void *data); void *demux_wav_init_plugin (xine_t *xine, void *data); +#ifdef HAVE_NOSEFART +void *demux_nsf_init_plugin (xine_t *xine, void *data); +#endif + #ifdef HAVE_MODPLUG void *demux_mod_init_plugin (xine_t *xine, void *data); #endif diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index b2ffcf078..d502b7955 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -2,7 +2,12 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooaudio.c -SUBDIRS = gsm610 nosefart +if BUILD_NOSEFART +nosefart_subdir = nosefart +nosefart_module = xineplug_decode_nsf.la +endif + +SUBDIRS = gsm610 $(nosefart_subdir) AM_LDFLAGS = $(xineplug_ldflags) @@ -16,7 +21,7 @@ endif xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ - xineplug_decode_nsf.la \ + $(nosefart_module) \ xineplug_decode_lpcm.la \ $(vorbis_module) \ $(speex_module) |