diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 23:41:28 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 23:41:28 +0100 |
| commit | da40425a2ab350e87e678ae64113dea47edf7079 (patch) | |
| tree | df7214f023e1c6ca527dced4f4439cfd3df2b264 /src | |
| parent | 188d7498b854233ac5f329fa342b16cbe1087d62 (diff) | |
| download | xine-lib-da40425a2ab350e87e678ae64113dea47edf7079.tar.gz xine-lib-da40425a2ab350e87e678ae64113dea47edf7079.tar.bz2 | |
Merge the sputext decoder and demuxer in a single plugin.
Diffstat (limited to 'src')
| -rw-r--r-- | src/spu_dec/Makefile.am | 9 | ||||
| -rw-r--r-- | src/spu_dec/sputext_decoder.c | 3 | ||||
| -rw-r--r-- | src/spu_dec/sputext_demuxer.c | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/spu_dec/Makefile.am b/src/spu_dec/Makefile.am index c1510f794..2511fc99d 100644 --- a/src/spu_dec/Makefile.am +++ b/src/spu_dec/Makefile.am @@ -8,7 +8,7 @@ xineplug_LTLIBRARIES = \ xineplug_decode_spucmml.la \ xineplug_decode_spu.la \ xineplug_decode_spudvb.la \ - xineplug_decode_sputext.la xineplug_dmx_sputext.la + xineplug_sputext.la xineplug_decode_spucc_la_SOURCES = cc_decoder.c cc_decoder.h xine_cc_decoder.c xineplug_decode_spucc_la_LIBADD = $(XINE_LIB) @@ -32,8 +32,5 @@ xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) -I$(top_srcdir)/s xineplug_decode_spudvb_la_SOURCES = spudvb_decoder.c xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) -xineplug_dmx_sputext_la_SOURCES = sputext_demuxer.c -xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) - -xineplug_decode_sputext_la_SOURCES = sputext_decoder.c -xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) +xineplug_sputext_la_SOURCES = sputext_demuxer.c sputext_decoder.c +xineplug_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c index 12d1986bb..73d242524 100644 --- a/src/spu_dec/sputext_decoder.c +++ b/src/spu_dec/sputext_decoder.c @@ -985,8 +985,11 @@ static const decoder_info_t spudec_info = { 1 /* priority */ }; +extern void *init_sputext_demux_class (xine_t *xine, void *data); + const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_SPU_DECODER | PLUGIN_MUST_PRELOAD, 17, "sputext", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_DEMUX, 27, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/spu_dec/sputext_demuxer.c b/src/spu_dec/sputext_demuxer.c index 270894f50..49ecbb172 100644 --- a/src/spu_dec/sputext_demuxer.c +++ b/src/spu_dec/sputext_demuxer.c @@ -1449,7 +1449,7 @@ static void config_timeout_cb(void *this_gen, xine_cfg_entry_t *entry) { this->max_timeout = entry->num_value; } -static void *init_sputext_demux_class (xine_t *xine, void *data) { +void *init_sputext_demux_class (xine_t *xine, void *data) { demux_sputext_class_t *this ; @@ -1481,9 +1481,3 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { return this; } - -const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 27, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; |