diff options
Diffstat (limited to 'src/demuxers')
28 files changed, 132 insertions, 146 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index ad95694d2..661b46923 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -137,4 +137,4 @@ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB) xineplug_dmx_nsv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ include_HEADERS = demux.h -noinst_HEADERS = asfheader.h qtpalette.h +noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 49e18fb4b..1edd6f0d3 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -23,7 +23,7 @@ * For more information on the 4xm file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_4xm.c,v 1.4 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_4xm.c,v 1.5 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -46,6 +46,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch0) | \ diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index b5e50d174..6c3d693b1 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -23,7 +23,7 @@ * This demuxer detects raw AC3 data in a file and shovels AC3 data * directly to the AC3 decoder. * - * $Id: demux_ac3.c,v 1.9 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_ac3.c,v 1.10 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -42,6 +42,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define AC3_PREAMBLE_BYTES 5 diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 3d0b2015f..bcc352845 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -21,7 +21,7 @@ /* * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_aiff.c,v 1.31 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_aiff.c,v 1.32 2003/08/25 21:51:38 f1rmb Exp $ * */ @@ -41,6 +41,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch3) | \ diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index a3298ff84..a2f1354b2 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -34,7 +34,7 @@ * data. This makes seeking conceptually impossible. Upshot: Random * seeking is not supported. * - * $Id: demux_aud.c,v 1.10 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_aud.c,v 1.11 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -52,6 +52,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_audio.h" #define AUD_HEADER_SIZE 12 #define AUD_CHUNK_PREAMBLE_SIZE 8 diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 1c6e63394..2c20b3fb0 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -24,7 +24,7 @@ * linear PCM "decoder" (which in turn sends them directly to the audio * output target; this is a really fancy CD-playing architecture). * - * $Id: demux_cdda.c,v 1.11 2003/08/10 16:11:05 miguelfreitas Exp $ + * $Id: demux_cdda.c,v 1.12 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -48,6 +48,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" /* 44100 samples/sec * 2 bytes/samples * 2 channels */ #define CD_BYTES_PER_SECOND (44100 * 2 * 2) diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 3949d2a5c..f2cbf79dd 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_eawve.c,v 1.19 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_eawve.c,v 1.20 2003/08/25 21:51:38 f1rmb Exp $ * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * @@ -44,6 +44,7 @@ #include "xineutils.h" #include "bswap.h" #include "demux.h" +#include "group_games.h" #define FOURCC_TAG(ch0, ch1, ch2, ch3) \ (((uint32_t)(ch3)) | \ @@ -422,7 +423,7 @@ static void class_dispose(demux_class_t *this){ free(this); } -void *demux_eawve_init_plugin(xine_t *xine, void *data){ +void *demux_eawve_init_plugin(xine_t *xine, void *data) { demux_eawve_class_t *this; this = xine_xmalloc(sizeof(demux_eawve_class_t)); @@ -436,10 +437,3 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data){ return this; } - -#if 0 -plugin_info_t xine_plugin_info[] = { - { PLUGIN_DEMUX, 22, "wve", XINE_VERSION_CODE, NULL, (void*)demux_eawve_init_plugin}, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 38542de69..afc6077d5 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.64 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_film.c,v 1.65 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -51,6 +51,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch3) | ( (long)(unsigned char)(ch2) << 8 ) | \ diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 37cd096cb..02dae326a 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -65,7 +65,7 @@ * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder * - * $Id: demux_idcin.c,v 1.42 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_idcin.c,v 1.43 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -91,6 +91,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define IDCIN_HEADER_SIZE 20 #define HUFFMAN_TABLE_SIZE 65536 @@ -554,15 +555,3 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index a99727e66..7ce6d148a 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -23,7 +23,7 @@ * For more information regarding the Interplay MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_ipmovie.c,v 1.12 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_ipmovie.c,v 1.13 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -46,6 +46,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define IPMOVIE_SIGNATURE "Interplay MVE File\x1A\0" #define IPMOVIE_SIGNATURE_SIZE 20 @@ -732,15 +733,3 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 9127f76f7..d64334972 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpgaudio.c,v 1.105 2003/08/10 16:03:21 miguelfreitas Exp $ + * $Id: demux_mpgaudio.c,v 1.106 2003/08/25 21:51:38 f1rmb Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -38,6 +38,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_audio.h" /* #define LOG @@ -883,17 +884,3 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { return this; } - - - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c index 7d0ac49bc..5aa75b9d1 100644 --- a/src/demuxers/demux_nsf.c +++ b/src/demuxers/demux_nsf.c @@ -30,7 +30,7 @@ * For more information regarding the NSF format, visit: * http://www.tripoint.org/kevtris/nes/nsfspec.txt * - * $Id: demux_nsf.c,v 1.14 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_nsf.c,v 1.15 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -53,6 +53,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_audio.h" #define NSF_HEADER_SIZE 0x80 #define NSF_SAMPLERATE 44100 diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 51d24f09a..2f05e0b24 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -23,7 +23,7 @@ * For more information regarding the NSV file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_nsv.c,v 1.4 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_nsv.c,v 1.5 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -478,7 +478,7 @@ static void class_dispose (demux_class_t *this_gen) { free (this); } -void *demux_nsv_init_plugin (xine_t *xine, void *data) { +static void *demux_nsv_init_plugin (xine_t *xine, void *data) { demux_nsv_class_t *this; this = xine_xmalloc (sizeof (demux_nsv_class_t)); diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 81124885d..8131ee183 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.164 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_qt.c,v 1.165 2003/08/25 21:51:38 f1rmb Exp $ * */ @@ -571,7 +571,7 @@ static void find_moov_atom(input_plugin_t *input, off_t *moov_offset, } /* create a qt_info structure or return NULL if no memory */ -qt_info *create_qt_info(void) { +static qt_info *create_qt_info(void) { qt_info *info; info = (qt_info *)xine_xmalloc(sizeof(qt_info)); @@ -609,7 +609,7 @@ qt_info *create_qt_info(void) { } /* release a qt_info structure and associated data */ -void free_qt_info(qt_info *info) { +static void free_qt_info(qt_info *info) { int i, j; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 843d78115..e3c47a9e5 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -21,7 +21,7 @@ /* * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_realaudio.c,v 1.21 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_realaudio.c,v 1.22 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -40,6 +40,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define RA_FILE_HEADER_SIZE 16 #define RA_AUDIO_HEADER_SIZE 0x39 diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 83b097b7f..cd27fbdae 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -23,7 +23,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: demux_roq.c,v 1.41 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_roq.c,v 1.42 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -46,6 +46,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define RoQ_MAGIC_NUMBER 0x1084 #define RoQ_CHUNK_PREAMBLE_SIZE 8 @@ -486,15 +487,3 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 44e35d1d8..a3e9d3b74 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -23,7 +23,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.40 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_smjpeg.c,v 1.41 2003/08/25 21:51:38 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -46,6 +46,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch3) | ( (long)(unsigned char)(ch2) << 8 ) | \ diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 3fd2af0a8..6f83ac447 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -21,7 +21,7 @@ /* * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_snd.c,v 1.31 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_snd.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -40,6 +40,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define SND_HEADER_SIZE 24 #define PCM_BLOCK_ALIGN 1024 diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index bc3d45377..eb596f84b 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -24,7 +24,7 @@ * This demuxer handles either raw STR files (which are just a concatenation * of raw compact disc sectors) or STR files with RIFF headers. * - * $Id: demux_str.c,v 1.14 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_str.c,v 1.15 2003/08/25 21:51:39 f1rmb Exp $ */ /* @@ -129,6 +129,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" /* There may be a RIFF/CDXA header at the beginning of the file, which * accounts for 0x2C bytes. We need at most 0x30 bytes of the sector to @@ -643,15 +644,3 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 974dd1d60..9a08a126d 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -25,7 +25,7 @@ * It will only play that block if it is PCM data. More variations will be * supported as they are encountered. * - * $Id: demux_voc.c,v 1.31 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_voc.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -44,6 +44,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define PCM_BLOCK_ALIGN 1024 #define VOC_HEADER_SIZE 0x1A diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 9027d716a..152671811 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -22,7 +22,7 @@ * VOX Demuxer by Mike Melanson (melanson@pcisys.net) * This a demuxer for .vox files containing raw Dialogic ADPCM data. * - * $Id: demux_vox.c,v 1.6 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_vox.c,v 1.7 2003/08/25 21:51:39 f1rmb Exp $ * */ @@ -42,6 +42,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define DIALOGIC_SAMPLERATE 8000 diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 4c007b149..d7a40c144 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -29,7 +29,7 @@ * block needs information from the previous audio block in order to be * decoded, thus making random seeking difficult. * - * $Id: demux_vqa.c,v 1.31 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_vqa.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -47,6 +47,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch3) | \ @@ -424,15 +425,3 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 34fc85d90..d318c5998 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -22,7 +22,7 @@ * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net) * based on WAV specs that are available far and wide * - * $Id: demux_wav.c,v 1.45 2003/08/16 20:15:55 jcdutton Exp $ + * $Id: demux_wav.c,v 1.46 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,6 +41,7 @@ #include "demux.h" #include "buffer.h" #include "bswap.h" +#include "group_audio.h" #define WAV_SIGNATURE_SIZE 16 /* this is the hex value for 'data' */ diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index d25a74476..643f99ff5 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -24,7 +24,7 @@ * For more information on the MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_wc3movie.c,v 1.39 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: demux_wc3movie.c,v 1.40 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -47,6 +47,7 @@ #include "compat.h" #include "demux.h" #include "bswap.h" +#include "group_games.h" #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ ( (long)(unsigned char)(ch3) | \ @@ -748,15 +749,3 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { return this; } - -/* - * exported plugin catalog entry - */ - -#if 0 -plugin_info_t xine_plugin_info[] = { - /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin }, - { PLUGIN_NONE, 0, "", 0, NULL, NULL } -}; -#endif diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 2880f587c..4c1d5b419 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -19,7 +19,7 @@ * * This file contains plugin entries for several demuxers used in games * - * $Id: group_audio.c,v 1.7 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: group_audio.c,v 1.8 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -29,18 +29,7 @@ #include "xine_internal.h" #include "demux.h" - -void *demux_ac3_init_plugin (xine_t *xine, void *data); -void *demux_aud_init_plugin (xine_t *xine, void *data); -void *demux_aiff_init_plugin (xine_t *xine, void *data); -void *demux_cdda_init_plugin (xine_t *xine, void *data); -void *demux_mpgaudio_init_class (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_snd_init_plugin (xine_t *xine, void *data); -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); +#include "group_audio.h" /* * exported plugin catalog entries diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h new file mode 100644 index 000000000..3d3061d12 --- /dev/null +++ b/src/demuxers/group_audio.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2000-2002 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: group_audio.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $ + */ + +#ifndef HAVE_GROUP_AUDIO_H +#define HAVE_GROUP_AUDIO_H + +#include "xine_internal.h" + +void *demux_ac3_init_plugin (xine_t *xine, void *data); +void *demux_aud_init_plugin (xine_t *xine, void *data); +void *demux_aiff_init_plugin (xine_t *xine, void *data); +void *demux_cdda_init_plugin (xine_t *xine, void *data); +void *demux_mpgaudio_init_class (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_snd_init_plugin (xine_t *xine, void *data); +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); + +#endif diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index 4f8e7d309..55e207b1f 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.c @@ -19,7 +19,7 @@ * * This file contains plugin entries for several demuxers used in games * - * $Id: group_games.c,v 1.5 2003/07/25 21:02:05 miguelfreitas Exp $ + * $Id: group_games.c,v 1.6 2003/08/25 21:51:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -29,17 +29,7 @@ #include "xine_internal.h" #include "demux.h" - -void *demux_eawve_init_plugin(xine_t *xine, void *data); -void *demux_idcin_init_plugin (xine_t *xine, void *data); -void *demux_ipmovie_init_plugin (xine_t *xine, void *data); -void *demux_vqa_init_plugin (xine_t *xine, void *data); -void *demux_wc3movie_init_plugin (xine_t *xine, void *data); -void *demux_roq_init_plugin (xine_t *xine, void *data); -void *demux_str_init_plugin (xine_t *xine, void *data); -void *demux_film_init_plugin (xine_t *xine, void *data); -void *demux_smjpeg_init_plugin (xine_t *xine, void *data); -void *demux_fourxm_init_plugin (xine_t *xine, void *data); +#include "group_games.h" /* * exported plugin catalog entries diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h new file mode 100644 index 000000000..1b8bfb60e --- /dev/null +++ b/src/demuxers/group_games.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2000-2002 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: group_games.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $ + */ + +#ifndef HAVE_GROUP_GAMES_H +#define HAVE_GROUP_GAMES_H + +#include "xine_internal.h" + +void *demux_eawve_init_plugin(xine_t *xine, void *data); +void *demux_idcin_init_plugin (xine_t *xine, void *data); +void *demux_ipmovie_init_plugin (xine_t *xine, void *data); +void *demux_vqa_init_plugin (xine_t *xine, void *data); +void *demux_wc3movie_init_plugin (xine_t *xine, void *data); +void *demux_roq_init_plugin (xine_t *xine, void *data); +void *demux_str_init_plugin (xine_t *xine, void *data); +void *demux_film_init_plugin (xine_t *xine, void *data); +void *demux_smjpeg_init_plugin (xine_t *xine, void *data); +void *demux_fourxm_init_plugin (xine_t *xine, void *data); + +#endif |