diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-02 22:18:56 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-02 22:18:56 +0000 |
commit | 6a90ef1128ca51713804e94da00f9c3a7440ec16 (patch) | |
tree | 7334efc2d5286d3842c0256a26673a381c9514b2 | |
parent | 11de71b0938af5b027b78b0e0db9617ab22a319f (diff) | |
download | xine-lib-6a90ef1128ca51713804e94da00f9c3a7440ec16.tar.gz xine-lib-6a90ef1128ca51713804e94da00f9c3a7440ec16.tar.bz2 |
Various static/const fixes from Gentoo.
CVS patchset: 8009
CVS date: 2006/06/02 22:18:56
95 files changed, 241 insertions, 245 deletions
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index a26554670..45c2fa600 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -591,7 +591,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_coreaudio = { +static const ao_info_t ao_info_coreaudio = { 1 }; diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index ab12b4591..cdcbeb4da 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.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: audio_directx2_out.c,v 1.6 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_directx2_out.c,v 1.7 2006/06/02 22:18:56 dsalt Exp $ * * * xine audio output plugin using DirectX @@ -1024,7 +1024,7 @@ static void *init_class(xine_t *xine, void *data) { } -static ao_info_t ao_info_directx2 = { +static const ao_info_t ao_info_directx2 = { 10 }; diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 81dc58154..6fca0eff8 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -20,7 +20,7 @@ * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: audio_directx_out.c,v 1.13 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_directx_out.c,v 1.14 2006/06/02 22:18:56 dsalt Exp $ */ /* @@ -856,7 +856,7 @@ static void *init_class (xine_t *xine, void *data) { return audiox; } -static ao_info_t ao_info_directx = { +static const ao_info_t ao_info_directx = { 1 /* priority */ }; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 69722be39..850f9d5a5 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.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: audio_esd_out.c,v 1.32 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_esd_out.c,v 1.33 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -592,7 +592,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_esd = { +static const ao_info_t ao_info_esd = { 4 }; diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index e3046df55..c4b51d325 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.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: audio_file_out.c,v 1.4 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_file_out.c,v 1.5 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -388,7 +388,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_file = { +static const ao_info_t ao_info_file = { -1 /* do not auto probe this one */ }; diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 375f4d097..eef501ab7 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -471,7 +471,7 @@ static void* init_class(xine_t *xine, void *data) { return class; } -static ao_info_t ao_info_fusionsound = { +static const ao_info_t ao_info_fusionsound = { 4 }; diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index 0590bff81..8bd4dd7fe 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.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: audio_irixal_out.c,v 1.13 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_irixal_out.c,v 1.14 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -405,7 +405,7 @@ static void *init_audio_out_plugin (config_values_t *config) return this; } -static ao_info_t ao_info_irixal = { +static const ao_info_t ao_info_irixal = { "xine audio output plugin using IRIX libaudio", 10 }; diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index 36b22ded1..3a06b36e3 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.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: audio_none_out.c,v 1.8 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_none_out.c,v 1.9 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -249,7 +249,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_none = { +static const ao_info_t ao_info_none = { -1 /* do not auto probe this one */ }; diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index b2e446755..07be3e19d 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.114 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_oss_out.c,v 1.115 2006/06/02 22:18:56 dsalt Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -1171,7 +1171,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_oss = { +static const ao_info_t ao_info_oss = { 9 /* less than alsa so xine will use alsa's native interface by default */ }; diff --git a/src/audio_out/audio_polyp_out.c b/src/audio_out/audio_polyp_out.c index 1fe82c00e..1d7334357 100644 --- a/src/audio_out/audio_polyp_out.c +++ b/src/audio_out/audio_polyp_out.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: audio_polyp_out.c,v 1.6 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_polyp_out.c,v 1.7 2006/06/02 22:18:56 dsalt Exp $ * * ao plugin for polypaudio: * http://0pointer.de/lennart/projects/polypaudio/ @@ -560,7 +560,7 @@ static void *init_class (xine_t *xine, void *data) { return this; } -static ao_info_t ao_info_polyp = { +static const ao_info_t ao_info_polyp = { 6 }; diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index f61f782c8..f28fc2858 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.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: audio_sun_out.c,v 1.41 2006/05/03 19:46:06 dsalt Exp $ + * $Id: audio_sun_out.c,v 1.42 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -993,7 +993,7 @@ static void *ao_sun_init_class (xine_t *xine, void *data) { } -static ao_info_t ao_info_sun = { +static const ao_info_t ao_info_sun = { 10 }; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 210cca0a6..f8587fe3c 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.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_asf.c,v 1.175 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_asf.c,v 1.176 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for asf streams * @@ -2332,7 +2332,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_asf = { +static const demuxer_info_t demux_info_asf = { 10 /* priority */ }; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 581573a13..027fe333d 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.225 2006/05/22 16:43:56 mshopf Exp $ + * $Id: demux_avi.c,v 1.226 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for avi streams * @@ -2357,7 +2357,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_avi = { +static const demuxer_info_t demux_info_avi = { 10 /* priority */ }; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 4750c4ee0..5b4e68744 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_elem.c,v 1.87 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_elem.c,v 1.88 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for elementary mpeg streams */ @@ -301,7 +301,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_elem = { +static const demuxer_info_t demux_info_elem = { 0 /* priority */ }; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index a53bdef0a..16820fcdd 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -24,7 +24,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.57 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_fli.c,v 1.58 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -394,7 +394,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_fli = { +static const demuxer_info_t demux_info_fli = { 10 /* priority */ }; diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index fac3c2fa1..15bbc82ec 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -24,7 +24,7 @@ * For more information on the FLV file format, visit: * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf * - * $Id: demux_flv.c,v 1.7 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_flv.c,v 1.8 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -339,7 +339,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_flv = { +static const demuxer_info_t demux_info_flv = { 10 /* priority */ }; diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 3970b21c0..a240b87ad 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -36,7 +36,7 @@ * * ANIM (Animations) * - Animation works fine, without seeking. * - * $Id: demux_iff.c,v 1.15 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_iff.c,v 1.16 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -1330,7 +1330,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_iff = { +static const demuxer_info_t demux_info_iff = { 10 /* priority */ }; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index eec5f97ce..5a6d64c08 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_image.c,v 1.22 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_image.c,v 1.23 2006/06/02 22:18:56 dsalt Exp $ * * image dummy demultiplexer */ @@ -260,7 +260,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_image = { +static const demuxer_info_t demux_info_image = { 11 /* priority */ }; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 8d73709e0..7900eb42e 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.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_matroska.c,v 1.45 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_matroska.c,v 1.46 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for matroska streams * @@ -2727,7 +2727,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_matroska = { +static const demuxer_info_t demux_info_matroska = { 10 /* priority */ }; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index fa3b8e6b0..29ae1108e 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.26 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_mng.c,v 1.27 2006/06/02 22:18:56 dsalt Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -374,7 +374,7 @@ static void *init_plugin(xine_t *xine, void *data){ return this; } -demuxer_info_t demux_info_mng = { +static const demuxer_info_t demux_info_mng = { 10 /* priority */ }; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index d677c0a76..0ec627f9d 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.148 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_mpeg.c,v 1.149 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -1263,7 +1263,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_mpeg = { +static const demuxer_info_t demux_info_mpeg = { 9 /* priority */ }; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 25ea044ec..1e8a603ea 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.213 2006/05/03 19:46:06 dsalt Exp $ + * $Id: demux_mpeg_block.c,v 1.214 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -1559,7 +1559,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_mpeg_block = { +static const demuxer_info_t demux_info_mpeg_block = { 10 /* priority */ }; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 23f67cefb..aa240044f 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.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_mpeg_pes.c,v 1.33 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_mpeg_pes.c,v 1.34 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -1672,7 +1672,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_mpeg_pes = { +static const demuxer_info_t demux_info_mpeg_pes = { 10 /* priority */ }; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 20e201462..d58a8e3f9 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.22 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_nsv.c,v 1.23 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -685,7 +685,7 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_nsv = { +static const demuxer_info_t demux_info_nsv = { 10 /* priority */ }; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index ae9d756f5..3cdfcadda 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.165 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_ogg.c,v 1.166 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for ogg streams * @@ -2116,11 +2116,11 @@ static void *ogg_init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_anx = { +static const demuxer_info_t demux_info_anx = { 20 /* priority */ }; -demuxer_info_t demux_info_ogg = { +static const demuxer_info_t demux_info_ogg = { 10 /* priority */ }; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index fccab780b..3ff1e3166 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -23,7 +23,7 @@ * For more information regarding the PVA file format, refer to this PDF: * http://www.technotrend.de/download/av_format_v1.pdf * - * $Id: demux_pva.c,v 1.22 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_pva.c,v 1.23 2006/06/02 22:18:56 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -520,7 +520,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_pva = { +static const demuxer_info_t demux_info_pva = { 10 /* priority */ }; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 7eb7e3a10..00a51c6f6 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.206 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_qt.c,v 1.207 2006/06/02 22:18:56 dsalt Exp $ * */ @@ -3090,7 +3090,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_qt = { +static const demuxer_info_t demux_info_qt = { 10 /* priority */ }; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 568bff6c8..49cc3d8b6 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_rawdv.c,v 1.26 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_rawdv.c,v 1.27 2006/06/02 22:18:56 dsalt Exp $ * * demultiplexer for raw dv streams */ @@ -443,7 +443,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_raw_dv = { +static const demuxer_info_t demux_info_raw_dv = { 1 /* priority */ }; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 1f415716f..11fa5c45f 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -31,7 +31,7 @@ * * Based on FFmpeg's libav/rm.c. * - * $Id: demux_real.c,v 1.107 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_real.c,v 1.108 2006/06/02 22:18:57 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -1651,7 +1651,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_real = { +static const demuxer_info_t demux_info_real = { 10 /* priority */ }; diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index ccc0563c7..772e0cf71 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.19 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_slave.c,v 1.20 2006/06/02 22:18:57 dsalt Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -433,7 +433,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_slave = { +static const demuxer_info_t demux_info_slave = { 10 /* priority */ }; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 08e40c28b..d8f42d2a1 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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_ts.c,v 1.119 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_ts.c,v 1.120 2006/06/02 22:18:57 dsalt Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -2200,7 +2200,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_ts = { +static const demuxer_info_t demux_info_ts = { 10 /* priority */ }; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 0b0801a8d..d3ee7415d 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -24,7 +24,7 @@ * tools, visit: * http://mjpeg.sourceforge.net/ * - * $Id: demux_yuv4mpeg2.c,v 1.41 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.42 2006/06/02 22:18:57 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -494,7 +494,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_yuv4mpeg2 = { +static const demuxer_info_t demux_info_yuv4mpeg2 = { 10 /* priority */ }; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 1be05028e..0b5f2901d 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -20,7 +20,7 @@ */ /* - * $Id: demux_yuv_frames.c,v 1.20 2006/05/03 19:46:07 dsalt Exp $ + * $Id: demux_yuv_frames.c,v 1.21 2006/06/02 22:18:57 dsalt Exp $ * * dummy demultiplexer for raw yuv frames (delivered by v4l) */ @@ -272,7 +272,7 @@ static void *init_class (xine_t *xine, void *data) { /* * exported plugin catalog entry */ -demuxer_info_t demux_info_yuv_frames = { +static const demuxer_info_t demux_info_yuv_frames = { 0 /* priority */ }; diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index c5e954b31..0b7eca8cd 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.22 2006/05/03 19:46:07 dsalt Exp $ + * $Id: group_audio.c,v 1.23 2006/06/02 22:18:57 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -35,72 +35,72 @@ * exported plugin catalog entries */ -demuxer_info_t demux_info_aac = { +static const demuxer_info_t demux_info_aac = { 0 /* priority */ }; -demuxer_info_t demux_info_ac3 = { +static const demuxer_info_t demux_info_ac3 = { 8 /* priority */ }; -demuxer_info_t demux_info_aud = { +static const demuxer_info_t demux_info_aud = { 10 /* priority */ }; -demuxer_info_t demux_info_aiff = { +static const demuxer_info_t demux_info_aiff = { 10 /* priority */ }; -demuxer_info_t demux_info_cdda = { +static const demuxer_info_t demux_info_cdda = { 6 /* priority */ }; -demuxer_info_t demux_info_dts = { +static const demuxer_info_t demux_info_dts = { 8 /* priority */ }; -demuxer_info_t demux_info_flac = { +static const demuxer_info_t demux_info_flac = { 10 /* priority */ }; -demuxer_info_t demux_info_mpgaudio = { +static const demuxer_info_t demux_info_mpgaudio = { 0 /* priority */ }; -demuxer_info_t demux_info_mpc = { +static const demuxer_info_t demux_info_mpc = { 0 /* priority */ }; -demuxer_info_t demux_info_nsf = { +static const demuxer_info_t demux_info_nsf = { 10 /* priority */ }; -demuxer_info_t demux_info_realaudio = { +static const demuxer_info_t demux_info_realaudio = { 10 /* priority */ }; -demuxer_info_t demux_info_shn = { +static const demuxer_info_t demux_info_shn = { 0 /* priority */ }; -demuxer_info_t demux_info_snd = { +static const demuxer_info_t demux_info_snd = { 10 /* priority */ }; -demuxer_info_t demux_info_voc = { +static const demuxer_info_t demux_info_voc = { 10 /* priority */ }; -demuxer_info_t demux_info_vox = { +static const demuxer_info_t demux_info_vox = { 10 /* priority */ }; -demuxer_info_t demux_info_wav = { +static const demuxer_info_t demux_info_wav = { 6 /* priority */ }; #ifdef HAVE_MODPLUG -demuxer_info_t demux_info_mod = { +static const demuxer_info_t demux_info_mod = { 10 /* priority */ }; #endif diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index e1c387e4d..cb33f33b3 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.13 2006/05/03 19:46:07 dsalt Exp $ + * $Id: group_games.c,v 1.14 2006/06/02 22:18:57 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -35,47 +35,47 @@ * exported plugin catalog entries */ -demuxer_info_t demux_info_eawve = { +static const demuxer_info_t demux_info_eawve = { 10 /* priority */ }; -demuxer_info_t demux_info_idcin = { +static const demuxer_info_t demux_info_idcin = { 10 /* priority */ }; -demuxer_info_t demux_info_ipmovie = { +static const demuxer_info_t demux_info_ipmovie = { 10 /* priority */ }; -demuxer_info_t demux_info_vqa = { +static const demuxer_info_t demux_info_vqa = { 10 /* priority */ }; -demuxer_info_t demux_info_wc3movie = { +static const demuxer_info_t demux_info_wc3movie = { 10 /* priority */ }; -demuxer_info_t demux_info_roq = { +static const demuxer_info_t demux_info_roq = { 10 /* priority */ }; -demuxer_info_t demux_info_str = { +static const demuxer_info_t demux_info_str = { 10 /* priority */ }; -demuxer_info_t demux_info_film = { +static const demuxer_info_t demux_info_film = { 10 /* priority */ }; -demuxer_info_t demux_info_smjpeg = { +static const demuxer_info_t demux_info_smjpeg = { 10 /* priority */ }; -demuxer_info_t demux_info_fourxm = { +static const demuxer_info_t demux_info_fourxm = { 10 /* priority */ }; -demuxer_info_t demux_info_vmd = { +static const demuxer_info_t demux_info_vmd = { 10 /* priority */ }; diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 0120fde65..29b5c9463 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.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: dxr3_decode_spu.c,v 1.53 2006/05/03 19:46:07 dsalt Exp $ + * $Id: dxr3_decode_spu.c,v 1.54 2006/06/02 22:18:57 dsalt Exp $ */ /* dxr3 spu decoder plugin. @@ -68,7 +68,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void *); /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; -static decoder_info_t dxr3_spudec_info = { +static const decoder_info_t dxr3_spudec_info = { supported_types, /* supported types */ 10 /* priority */ }; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 9cd892ab9..58583d1d8 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.61 2006/05/03 19:46:07 dsalt Exp $ + * $Id: dxr3_decode_video.c,v 1.62 2006/06/02 22:18:57 dsalt Exp $ */ /* dxr3 video decoder plugin. @@ -69,7 +69,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *); /* plugin catalog information */ static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; -static decoder_info_t dxr3_video_decoder_info = { +static const decoder_info_t dxr3_video_decoder_info = { supported_types, /* supported types */ 10 /* priority */ }; diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index ab5b51366..c5199edf3 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.c,v 1.112 2006/01/27 07:46:12 tmattern Exp $ + * $Id: video_out_dxr3.c,v 1.113 2006/06/02 22:18:57 dsalt Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -80,18 +80,18 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen); /* plugin catalog information */ #ifdef HAVE_X11 -static vo_info_t vo_info_dxr3_x11 = { +static const vo_info_t vo_info_dxr3_x11 = { 10, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; #endif -static vo_info_t vo_info_dxr3_aa = { +static const vo_info_t vo_info_dxr3_aa = { 10, /* priority */ XINE_VISUAL_TYPE_AA /* visual type */ }; -plugin_info_t xine_plugin_info[] = { +const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ #ifdef HAVE_X11 { PLUGIN_VIDEO_OUT, 21, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin }, @@ -223,12 +223,12 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v plugin_node_t *node; #ifdef HAVE_X11 - static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", + static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", "letterboxed overlay", "widescreen overlay", NULL }; #else - static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; + static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; #endif - static char *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; + static const char const *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; int list_id, list_size; xine_sarray_t *plugin_list; @@ -1247,7 +1247,7 @@ static void dxr3_dispose(vo_driver_t *this_gen) close(this->fd_control); pthread_mutex_lock(&this->spu_device_lock); if (this->fd_spu) { - uint8_t empty_spu[] = { + static const uint8_t empty_spu[] = { 0x00, 0x26, 0x00, 0x08, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x20, 0x01, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00, diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 661ef3a2d..b1c98c5aa 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.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: input_smb.c,v 1.11 2006/05/03 19:46:07 dsalt Exp $ + * $Id: input_smb.c,v 1.12 2006/06/02 22:18:57 dsalt Exp $ */ @@ -533,7 +533,7 @@ static void return (input_class_t *) this; } -static input_info_t input_info_smb = { +static const input_info_t input_info_smb = { 0 /* priority */ }; diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index a8f7219e3..a2ab59a5d 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_decoder.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: xine_decoder.c,v 1.78 2006/06/02 19:54:05 dsalt Exp $ + * $Id: xine_decoder.c,v 1.79 2006/06/02 22:18:57 dsalt Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -854,7 +854,7 @@ static uint32_t audio_types[] = { 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c index 3beb1ea08..8bc95016d 100644 --- a/src/libdts/xine_decoder.c +++ b/src/libdts/xine_decoder.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: xine_decoder.c,v 1.64 2006/05/03 19:46:07 dsalt Exp $ + * $Id: xine_decoder.c,v 1.65 2006/06/02 22:18:57 dsalt Exp $ * * 04-09-2001 DTS passtrough (C) Joachim Koenig * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton @@ -602,7 +602,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_DTS, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c index a2e2fe625..5c07e9aeb 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/xine_decoder.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: xine_decoder.c,v 1.45 2006/05/03 19:46:07 dsalt Exp $ + * $Id: xine_decoder.c,v 1.46 2006/06/02 22:18:57 dsalt Exp $ * */ @@ -468,7 +468,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_AAC, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c index 22ef90704..65f4422ca 100644 --- a/src/libflac/decoder_flac.c +++ b/src/libflac/decoder_flac.c @@ -395,7 +395,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_FLAC, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index 73ec1f0eb..c5b1fab48 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/liblpcm/xine_decoder.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: xine_decoder.c,v 1.58 2006/05/03 19:46:07 dsalt Exp $ + * $Id: xine_decoder.c,v 1.59 2006/06/02 22:18:57 dsalt Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -280,7 +280,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_LPCM_BE, BUF_AUDIO_LPCM_LE, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index 36816b667..b14bf5f1b 100644 --- a/src/libmad/xine_decoder.c +++ b/src/libmad/xine_decoder.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: xine_decoder.c,v 1.55 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.56 2006/06/02 22:18:57 dsalt Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ @@ -363,7 +363,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_MPEG, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 7 /* priority */ }; diff --git a/src/libmpeg2/header.c b/src/libmpeg2/header.c index e435fb405..7f1ef1fc8 100644 --- a/src/libmpeg2/header.c +++ b/src/libmpeg2/header.c @@ -34,7 +34,7 @@ #include "attributes.h" /* default intra quant matrix, in zig-zag order */ -static uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = { +static const uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = { 8, 16, 16, 19, 16, 19, diff --git a/src/libmpeg2/idct_altivec.c b/src/libmpeg2/idct_altivec.c index d5737331d..2ebdd3241 100644 --- a/src/libmpeg2/idct_altivec.c +++ b/src/libmpeg2/idct_altivec.c @@ -489,7 +489,7 @@ void mpeg2_idct_add_altivec (int16_t * block, uint8_t * dest, int stride) ); } -static int16_t constants[5][8] ATTR_ALIGN(16) __attribute__((used)) = { +static const int16_t constants[5][8] ATTR_ALIGN(16) __attribute__((used)) = { {23170, 13573, 6518, 21895, -23170, -21895, 32, 31}, {16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725}, {22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521}, diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c index 1ef3fb585..fb0fab1e9 100644 --- a/src/libmpeg2/slice_xvmc.c +++ b/src/libmpeg2/slice_xvmc.c @@ -46,7 +46,7 @@ #include "vlc.h" /* original (non-patched) scan tables */ -static uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) = +static const uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) = { /* Zig-Zag scan pattern */ 0, 1, 8,16, 9, 2, 3,10, @@ -59,7 +59,7 @@ static uint8_t mpeg2_scan_norm_orig[64] ATTR_ALIGN(16) = 53,60,61,54,47,55,62,63 }; -static uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) = +static const uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) = { /* Alternate scan pattern */ 0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49, @@ -68,9 +68,9 @@ static uint8_t mpeg2_scan_alt_orig[64] ATTR_ALIGN(16) = 53,61,22,30,7,15,23,31,38,46,54,62,39,47,55,63 }; -uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); -uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); -uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); +static uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); +static uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); +static uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); void xvmc_setup_scan_ptable( void ) { @@ -83,7 +83,7 @@ void xvmc_setup_scan_ptable( void ) } -static int non_linear_quantizer_scale [] = { +static const int non_linear_quantizer_scale [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 18, 20, 22, 24, 28, 32, 36, 40, 44, 48, 52, diff --git a/src/libmpeg2/slice_xvmc_vld.c b/src/libmpeg2/slice_xvmc_vld.c index 3647c7386..7e370a519 100644 --- a/src/libmpeg2/slice_xvmc_vld.c +++ b/src/libmpeg2/slice_xvmc_vld.c @@ -23,7 +23,7 @@ #include "mpeg2_internal.h" #include "xvmc_vld.h" -static uint8_t zig_zag_scan[64] ATTR_ALIGN(16) = +static const uint8_t zig_zag_scan[64] ATTR_ALIGN(16) = { /* Zig-Zag scan pattern */ 0, 1, 8,16, 9, 2, 3,10, @@ -36,7 +36,7 @@ static uint8_t zig_zag_scan[64] ATTR_ALIGN(16) = 53,60,61,54,47,55,62,63 }; -static uint8_t alternate_scan [64] ATTR_ALIGN(16) = +static const uint8_t alternate_scan [64] ATTR_ALIGN(16) = { /* Alternate scan pattern */ 0,8,16,24,1,9,2,10,17,25,32,40,48,56,57,49, diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c index 7dcb2a831..17957a6d3 100644 --- a/src/libmpeg2/xine_decoder.c +++ b/src/libmpeg2/xine_decoder.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: xine_decoder.c,v 1.57 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.58 2006/06/02 22:18:57 dsalt Exp $ * * stuff needed to turn libmpeg2 into a xine decoder plugin */ @@ -172,7 +172,7 @@ static void *init_plugin (xine_t *xine, void *data) { static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; -static decoder_info_t dec_info_mpeg2 = { +static const decoder_info_t dec_info_mpeg2 = { supported_types, /* supported types */ 7 /* priority */ }; diff --git a/src/libmpeg2/xvmc.h b/src/libmpeg2/xvmc.h index e6204395d..5d61bcf83 100644 --- a/src/libmpeg2/xvmc.h +++ b/src/libmpeg2/xvmc.h @@ -26,10 +26,6 @@ /* slice_xvmc.c */ -extern uint8_t mpeg2_scan_alt_ptable[64] ATTR_ALIGN(16); -extern uint8_t mpeg2_scan_norm_ptable[64] ATTR_ALIGN(16); -extern uint8_t mpeg2_scan_orig_ptable[64] ATTR_ALIGN(16); - void mpeg2_xvmc_slice (mpeg2dec_accel_t *accel, picture_t * picture, int code, uint8_t * buffer); void xvmc_setup_scan_ptable( void ); diff --git a/src/libmusepack/xine_decoder.c b/src/libmusepack/xine_decoder.c index 10c31ee66..f7cf37b0e 100644 --- a/src/libmusepack/xine_decoder.c +++ b/src/libmusepack/xine_decoder.c @@ -23,7 +23,7 @@ * 32bit float output * Seeking?? * - * $Id: xine_decoder.c,v 1.6 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.7 2006/06/02 22:18:57 dsalt Exp $ */ #include <stdio.h> @@ -454,7 +454,7 @@ static uint32_t audio_types[] = { 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c index 54453c698..ecae6e497 100644 --- a/src/libreal/audio_decoder.c +++ b/src/libreal/audio_decoder.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: audio_decoder.c,v 1.46 2006/05/03 19:46:08 dsalt Exp $ + * $Id: audio_decoder.c,v 1.47 2006/06/02 22:18:57 dsalt Exp $ * * thin layer to use real binary-only codecs in xine * @@ -753,7 +753,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c index 9825ae27a..585c35d90 100644 --- a/src/libreal/xine_decoder.c +++ b/src/libreal/xine_decoder.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: xine_decoder.c,v 1.80 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.81 2006/06/02 22:18:57 dsalt Exp $ * * thin layer to use real binary-only codecs in xine * @@ -634,7 +634,7 @@ static uint32_t supported_types[] = { BUF_VIDEO_RV20, BUF_VIDEO_RV40, 0 }; -static decoder_info_t dec_info_real = { +static const decoder_info_t dec_info_real = { supported_types, /* supported types */ 7 /* priority */ }; diff --git a/src/libspeex/xine_decoder.c b/src/libspeex/xine_decoder.c index 50eee2fa9..40bf66b8f 100644 --- a/src/libspeex/xine_decoder.c +++ b/src/libspeex/xine_decoder.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: xine_decoder.c,v 1.18 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.19 2006/06/02 22:18:57 dsalt Exp $ * * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine */ @@ -431,7 +431,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_SPEEX, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c index 060e9b8cb..cb82c6c3e 100644 --- a/src/libspucc/xine_decoder.c +++ b/src/libspucc/xine_decoder.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: xine_decoder.c,v 1.32 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.33 2006/06/02 22:18:58 dsalt Exp $ * * closed caption spu decoder. receive data by events. * @@ -357,7 +357,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_CC, 0 }; -static decoder_info_t spudec_info = { +static const decoder_info_t spudec_info = { supported_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libspucmml/xine_decoder.c b/src/libspucmml/xine_decoder.c index d2a0c5fbd..075a60181 100644 --- a/src/libspucmml/xine_decoder.c +++ b/src/libspucmml/xine_decoder.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: xine_decoder.c,v 1.5 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.6 2006/06/02 22:18:58 dsalt Exp $ * */ @@ -537,7 +537,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_CMML, 0 }; -static decoder_info_t spudec_info = { +static const decoder_info_t spudec_info = { supported_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 8d89fc32a..b71960dc1 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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: xine_decoder.c,v 1.114 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.115 2006/06/02 22:18:58 dsalt Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -392,7 +392,7 @@ static void *init_plugin (xine_t *xine, void *data) { /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; -static decoder_info_t dec_info_data = { +static const decoder_info_t dec_info_data = { supported_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libspudvb/xine_decoder.c b/src/libspudvb/xine_decoder.c index 71ef608f6..bddf263de 100644 --- a/src/libspudvb/xine_decoder.c +++ b/src/libspudvb/xine_decoder.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: xine_decoder.c,v 1.18 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.19 2006/06/02 22:18:58 dsalt Exp $ * * DVB Subtitle decoder (ETS 300 743) * (c) 2004 Mike Lampard <mlampard@users.sourceforge.net> @@ -864,7 +864,7 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_DVB, 0 }; -static decoder_info_t spudec_info = { +static const decoder_info_t spudec_info = { supported_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index b07f6634e..641c65e25 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/xine_decoder.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: xine_decoder.c,v 1.92 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.93 2006/06/02 22:18:58 dsalt Exp $ * */ @@ -944,7 +944,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_TEXT, BUF_SPU_OGM, 0 }; -static decoder_info_t spudec_info = { +static const decoder_info_t spudec_info = { supported_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libtheora/xine_decoder.c b/src/libtheora/xine_decoder.c index b41390517..d17a1bc3b 100644 --- a/src/libtheora/xine_decoder.c +++ b/src/libtheora/xine_decoder.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: xine_decoder.c,v 1.24 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.25 2006/06/02 22:18:58 dsalt Exp $ * * xine decoder plugin using libtheora * @@ -390,7 +390,7 @@ static void *init_plugin (xine_t *xine, void *data) { static uint32_t supported_types[] = { BUF_VIDEO_THEORA, 0 }; -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { supported_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c index c471ca343..7db5fed02 100644 --- a/src/libvorbis/xine_decoder.c +++ b/src/libvorbis/xine_decoder.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: xine_decoder.c,v 1.45 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_decoder.c,v 1.46 2006/06/02 22:18:58 dsalt Exp $ * * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine */ @@ -339,7 +339,7 @@ static uint32_t audio_types[] = { BUF_AUDIO_VORBIS, 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 0f8dc8002..536ac22ff 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.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: qt_decoder.c,v 1.42 2006/05/07 09:31:57 valtri Exp $ + * $Id: qt_decoder.c,v 1.43 2006/06/02 22:18:58 dsalt Exp $ * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer @@ -617,7 +617,7 @@ static uint32_t audio_types[] = { 0 }; -static decoder_info_t qta_dec_info = { +static const decoder_info_t qta_dec_info = { audio_types, /* supported types */ 1 /* priority */ }; @@ -1148,7 +1148,7 @@ static void *qtv_init_class (xine_t *xine, void *data) { static uint32_t qtv_supported_types[] = { BUF_VIDEO_SORENSON_V3, 0 }; -static decoder_info_t qtv_dec_info = { +static const decoder_info_t qtv_dec_info = { qtv_supported_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index d567b9183..070dcaa8e 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.152 2006/05/07 09:31:57 valtri Exp $ + * $Id: w32codec.c,v 1.153 2006/06/02 22:18:58 dsalt Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1700,7 +1700,7 @@ static uint32_t video_types[] = { 0 }; -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { video_types, /* supported types */ 1 /* priority */ }; @@ -1713,7 +1713,7 @@ static uint32_t audio_types[] = { 0 }; -static decoder_info_t dec_info_audio = { +static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index e63c9c909..61c2763a8 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -28,7 +28,7 @@ * 8 (long and short) * - untested (found no testfiles) IFF-ANIM OPT 3, 4 and 6 * - * $Id: bitplane.c,v 1.13 2006/05/03 19:46:08 dsalt Exp $ + * $Id: bitplane.c,v 1.14 2006/06/02 22:18:58 dsalt Exp $ */ #include <stdio.h> @@ -1574,13 +1574,13 @@ static void *init_plugin (xine_t *xine, void *data) { * exported plugin catalog entry */ -static uint32_t video_types[] = { +static const uint32_t video_types[] = { BUF_VIDEO_BITPLANE, BUF_VIDEO_BITPLANE_BR1, 0 }; -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { video_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 442ae894f..c5b07527e 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -23,7 +23,7 @@ * value from the last frame. This creates a slowly rotating solid color * frame when the frames are played in succession. * - * $Id: foovideo.c,v 1.24 2006/05/03 19:46:08 dsalt Exp $ + * $Id: foovideo.c,v 1.25 2006/06/02 22:18:58 dsalt Exp $ */ #include <stdio.h> @@ -274,7 +274,7 @@ static void *init_plugin (xine_t *xine, void *data) { * list of valid buffer types (and add a new one if the one you need does * not exist). Terminate the list with a 0. */ -static uint32_t video_types[] = { +static const uint32_t video_types[] = { /* BUF_VIDEO_FOOVIDEO, */ BUF_VIDEO_VQA, BUF_VIDEO_SORENSON_V3, @@ -287,7 +287,7 @@ static uint32_t video_types[] = { * plugins that handle the same buffer type. A plugin with priority (n+1) * will be used instead of a plugin with priority (n). */ -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { video_types, /* supported types */ 5 /* priority */ }; diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index a0fdcb338..d3d8953db 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.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: gdkpixbuf.c,v 1.4 2006/05/03 19:46:08 dsalt Exp $ + * $Id: gdkpixbuf.c,v 1.5 2006/06/02 22:18:58 dsalt Exp $ * * a gdk-pixbuf-based image video decoder */ @@ -302,7 +302,7 @@ static void *init_class (xine_t *xine, void *data) { static uint32_t supported_types[] = { BUF_VIDEO_IMAGE, 0 }; -static decoder_info_t dec_info_image = { +static const decoder_info_t dec_info_image = { supported_types, /* supported types */ 7 /* priority */ }; diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index e51033ca2..383224ed9 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.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: image.c,v 1.18 2006/05/03 19:46:08 dsalt Exp $ + * $Id: image.c,v 1.19 2006/06/02 22:18:58 dsalt Exp $ * * a image video decoder */ @@ -273,7 +273,7 @@ static void *init_class (xine_t *xine, void *data) { static uint32_t supported_types[] = { BUF_VIDEO_IMAGE, 0 }; -static decoder_info_t dec_info_image = { +static const decoder_info_t dec_info_image = { supported_types, /* supported types */ 6 /* priority */ }; diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 264a0ac5d..744fc1b65 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -30,7 +30,7 @@ * One more catch: Raw RGB from a Microsoft file is upside down. This is * indicated by a negative height parameter. * - * $Id: rgb.c,v 1.32 2006/05/03 19:46:08 dsalt Exp $ + * $Id: rgb.c,v 1.33 2006/06/02 22:18:58 dsalt Exp $ */ #include <stdio.h> @@ -448,12 +448,12 @@ static void *init_plugin (xine_t *xine, void *data) { * exported plugin catalog entry */ -static uint32_t video_types[] = { +static const uint32_t video_types[] = { BUF_VIDEO_RGB, 0 }; -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { video_types, /* supported types */ 1 /* priority */ }; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index cc551a119..639144223 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -21,7 +21,7 @@ * Actually, this decoder just reorganizes chunks of raw YUV data in such * a way that xine can display them. * - * $Id: yuv.c,v 1.35 2006/05/03 19:46:08 dsalt Exp $ + * $Id: yuv.c,v 1.36 2006/06/02 22:18:58 dsalt Exp $ */ #include <stdio.h> @@ -371,7 +371,7 @@ static void *init_plugin (xine_t *xine, void *data) { * exported plugin catalog entry */ -static uint32_t video_types[] = { +static const uint32_t video_types[] = { BUF_VIDEO_YUY2, BUF_VIDEO_YV12, BUF_VIDEO_YVU9, @@ -380,7 +380,7 @@ static uint32_t video_types[] = { 0 }; -static decoder_info_t dec_info_video = { +static const decoder_info_t dec_info_video = { video_types, /* supported types */ 1 /* priority */ }; diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c index f8d4bc0e8..a3f3e7c1d 100644 --- a/src/post/audio/audio_filters.c +++ b/src/post/audio/audio_filters.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: audio_filters.c,v 1.5 2006/05/03 19:46:08 dsalt Exp $ + * $Id: audio_filters.c,v 1.6 2006/06/02 22:18:58 dsalt Exp $ * * catalog for audio filter plugins */ @@ -30,10 +30,10 @@ #include "audio_filters.h" -post_info_t upmix_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; -post_info_t upmix_mono_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; -post_info_t stretch_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; -post_info_t volnorm_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; +static const post_info_t upmix_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; +static const post_info_t upmix_mono_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; +static const post_info_t stretch_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; +static const post_info_t volnorm_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; const plugin_info_t xine_plugin_info[] = { diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index adbfa6c65..07d2bd448 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.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: xine_plugin.c,v 1.49 2006/05/03 19:46:08 dsalt Exp $ + * $Id: xine_plugin.c,v 1.50 2006/06/02 22:18:58 dsalt Exp $ * * advanced video deinterlacer plugin * Jun/2003 by Miguel Freitas @@ -45,7 +45,7 @@ static void *deinterlace_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -post_info_t deinterlace_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t deinterlace_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index ad37f0c60..9689e3137 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.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: mosaico.c,v 1.26 2006/05/03 19:46:08 dsalt Exp $ + * $Id: mosaico.c,v 1.27 2006/06/02 22:18:58 dsalt Exp $ */ /* @@ -39,7 +39,7 @@ static void *mosaico_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -post_info_t mosaico_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; +static const post_info_t mosaico_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 6b7011455..48a5bf561 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.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: switch.c,v 1.16 2006/05/03 19:46:08 dsalt Exp $ + * $Id: switch.c,v 1.17 2006/06/02 22:18:58 dsalt Exp $ */ /* @@ -39,7 +39,7 @@ static void *switch_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -post_info_t switch_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; +static const post_info_t switch_special_info = { XINE_POST_TYPE_VIDEO_COMPOSE }; const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c index 949d3fec3..97bb06c66 100644 --- a/src/post/planar/planar.c +++ b/src/post/planar/planar.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: planar.c,v 1.11 2006/05/03 19:46:09 dsalt Exp $ + * $Id: planar.c,v 1.12 2006/06/02 22:18:58 dsalt Exp $ * * catalog for planar post plugins */ @@ -27,34 +27,34 @@ #include "xineutils.h" extern void *invert_init_plugin(xine_t *xine, void *); -post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *expand_init_plugin(xine_t *xine, void *); -post_info_t expand_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t expand_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *fill_init_plugin(xine_t *xine, void*); -post_info_t fill_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t fill_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *eq_init_plugin(xine_t *xine, void *); -post_info_t eq_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t eq_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *boxblur_init_plugin(xine_t *xine, void *); -post_info_t boxblur_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t boxblur_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *denoise3d_init_plugin(xine_t *xine, void *); -post_info_t denoise3d_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t denoise3d_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *eq2_init_plugin(xine_t *xine, void *); -post_info_t eq2_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t eq2_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *unsharp_init_plugin(xine_t *xine, void *); -post_info_t unsharp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t unsharp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *pp_init_plugin(xine_t *xine, void *); -post_info_t pp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t pp_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; extern void *noise_init_plugin(xine_t *xine, void *); -post_info_t noise_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; +static const post_info_t noise_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index e7e015388..b972ac329 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -23,7 +23,7 @@ * process. It simply paints the screen a solid color and rotates through * colors on each iteration. * - * $Id: fooviz.c,v 1.25 2006/05/03 19:46:09 dsalt Exp $ + * $Id: fooviz.c,v 1.26 2006/06/02 22:18:58 dsalt Exp $ * */ @@ -313,7 +313,7 @@ static void *fooviz_init_plugin(xine_t *xine, void *data) } /* plugin catalog information */ -post_info_t fooviz_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; +static const post_info_t fooviz_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c index fe3649f86..cd1af3eff 100644 --- a/src/post/visualizations/visualizations.c +++ b/src/post/visualizations/visualizations.c @@ -19,7 +19,7 @@ * * This file contains plugin entries for several visualization post plugins. * - * $Id: visualizations.c,v 1.12 2006/05/03 19:46:09 dsalt Exp $ + * $Id: visualizations.c,v 1.13 2006/06/02 22:18:58 dsalt Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,9 +41,9 @@ void *fftgraph_init_plugin(xine_t *xine, void *data); */ /* plugin catalog information */ -post_info_t oscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; -post_info_t fftscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; -post_info_t fftgraph_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; +static const post_info_t oscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; +static const post_info_t fftscope_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; +static const post_info_t fftgraph_special_info = { XINE_POST_TYPE_AUDIO_VISUALIZATION }; const plugin_info_t xine_plugin_info[] = { diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 4609d773b..14f051e4e 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.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: video_out_aa.c,v 1.47 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_aa.c,v 1.48 2006/06/02 22:18:58 dsalt Exp $ * * video_out_aa.c, ascii-art output plugin for xine * @@ -332,7 +332,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_aa = { +static const vo_info_t vo_info_aa = { 6, XINE_VISUAL_TYPE_AA }; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index a8d9ca3c2..9b22bd254 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.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: video_out_caca.c,v 1.6 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_caca.c,v 1.7 2006/06/02 22:18:58 dsalt Exp $ * * video_out_caca.c, Color AsCii Art output plugin for xine * @@ -333,7 +333,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_caca = { +static const vo_info_t vo_info_caca = { 6, XINE_VISUAL_TYPE_CACA }; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index fc5a6cc78..3d0177f2f 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1577,7 +1577,7 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_directfb_fb = { +static const vo_info_t vo_info_directfb_fb = { 8, /* priority */ XINE_VISUAL_TYPE_FB /* visual type */ }; @@ -1768,7 +1768,7 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_directfb_x11 = { +static const vo_info_t vo_info_directfb_x11 = { 8, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index fe1cf9ef8..eef587aab 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -20,7 +20,7 @@ * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: video_out_directx.c,v 1.29 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_directx.c,v 1.30 2006/06/02 22:18:58 dsalt Exp $ */ typedef unsigned char boolean; @@ -1264,7 +1264,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return directx; } -static vo_info_t vo_info_win32 = { +static const vo_info_t vo_info_win32 = { 7, /* priority */ XINE_VISUAL_TYPE_DIRECTX /* visual type */ }; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index b70bbd486..cfcaba890 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.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: video_out_fb.c,v 1.46 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_fb.c,v 1.47 2006/06/02 22:18:58 dsalt Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -1122,7 +1122,7 @@ static void *fb_init_class(xine_t *xine, void *visual_gen) return this; } -static vo_info_t vo_info_fb = +static const vo_info_t vo_info_fb = { 1, /* priority */ #ifdef USE_X11_VISUAL diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 0149dfbc1..1a8fb821d 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -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: video_out_macosx.m,v 1.14 2005/11/14 12:34:46 valtri Exp $ + * $Id: video_out_macosx.m,v 1.15 2006/06/02 22:18:58 dsalt Exp $ * * This output driver makes use of xine's objective-c video_output * classes located in the macosx folder. @@ -372,7 +372,7 @@ static void *init_class (xine_t *xine, void *visual) { return this; } -static vo_info_t vo_info_macosx = { +static const vo_info_t vo_info_macosx = { 1, /* Priority */ XINE_VISUAL_TYPE_MACOSX /* Visual type */ }; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index a4dab44c5..5b516117e 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.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: video_out_none.c,v 1.25 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_none.c,v 1.26 2006/06/02 22:18:58 dsalt Exp $ * * Was originally part of toxine frontend. * ...but has now been adapted to xine coding style standards ;) @@ -301,7 +301,7 @@ static void *init_class (xine_t *xine, void *visual) { return this; } -static vo_info_t vo_info_none = { +static const vo_info_t vo_info_none = { 5, /* Priority */ XINE_VISUAL_TYPE_NONE /* Visual type */ }; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index f83d7a195..301c3587c 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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: video_out_opengl.c,v 1.55 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_opengl.c,v 1.56 2006/06/02 22:18:58 dsalt Exp $ * * video_out_opengl.c, OpenGL based interface for xine * @@ -1982,7 +1982,7 @@ static void *opengl_init_class (xine_t *xine, void *visual_gen) { } -static vo_info_t vo_info_opengl = { +static const vo_info_t vo_info_opengl = { 7, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 07144b6f9..6e9a581b9 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.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: video_out_pgx32.c,v 1.15 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_pgx32.c,v 1.16 2006/06/02 22:18:58 dsalt Exp $ * * video_out_pgx32.c, Sun PGX32 output plugin for xine * @@ -793,7 +793,7 @@ static void pgx32_dispose_class(video_driver_class_t *class_gen) free(class); } -static vo_info_t vo_info_pgx32 = { +static const vo_info_t vo_info_pgx32 = { 10, XINE_VISUAL_TYPE_X11 }; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 61fb22aad..b242a83cc 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.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: video_out_pgx64.c,v 1.76 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_pgx64.c,v 1.77 2006/06/02 22:18:58 dsalt Exp $ * * video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine * @@ -1343,7 +1343,7 @@ static void pgx64_dispose_class(video_driver_class_t *class_gen) free(class); } -static vo_info_t vo_info_pgx64 = { +static const vo_info_t vo_info_pgx64 = { 10, XINE_VISUAL_TYPE_X11 }; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 0d03a32f9..f6272a2c2 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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: video_out_sdl.c,v 1.46 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_sdl.c,v 1.47 2006/06/02 22:18:58 dsalt Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -603,7 +603,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_sdl = { +static const vo_info_t vo_info_sdl = { 4, /* priority */ XINE_VISUAL_TYPE_X11, /* visual type supported by this plugin */ }; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index 539bdbe2f..2d5e5a8dc 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.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: video_out_stk.c,v 1.17 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_stk.c,v 1.18 2006/06/02 22:18:59 dsalt Exp $ * * video_out_stk.c, Libstk Surface Video Driver * more info on Libstk at http://www.libstk.org @@ -479,7 +479,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { } /* what priority should we be (what is low), what vistype should we declare ? */ -static vo_info_t vo_info_stk = { +static const vo_info_t vo_info_stk = { 4, /* priority */ XINE_VISUAL_TYPE_FB, /* visual type supported by this plugin */ }; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 8d462d86c..5db2ffc40 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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: video_out_syncfb.c,v 1.103 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_syncfb.c,v 1.104 2006/06/02 22:18:59 dsalt Exp $ * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * @@ -1106,7 +1106,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_syncfb = { +static const vo_info_t vo_info_syncfb = { 7, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 4dfcac101..0ae796af4 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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: video_out_vidix.c,v 1.72 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_vidix.c,v 1.73 2006/06/02 22:18:59 dsalt Exp $ * * video_out_vidix.c * @@ -1218,7 +1218,7 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_vidix = { +static const vo_info_t vo_info_vidix = { 2, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; @@ -1300,7 +1300,7 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_vidixfb = { +static const vo_info_t vo_info_vidixfb = { 2, /* priority */ XINE_VISUAL_TYPE_FB /* visual type */ }; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index e4c6ec9f0..d28c2adc0 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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: video_out_xshm.c,v 1.143 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_xshm.c,v 1.144 2006/06/02 22:18:59 dsalt Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -1289,7 +1289,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { } -static vo_info_t vo_info_xshm = { +static const vo_info_t vo_info_xshm = { 6, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 82bb0c68c..8623e8c03 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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: video_out_xv.c,v 1.217 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_xv.c,v 1.218 2006/06/02 22:18:59 dsalt Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -1597,7 +1597,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_xv = { +static const vo_info_t vo_info_xv = { 9, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index ebcadd347..41c157a15 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.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: video_out_xvmc.c,v 1.26 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_xvmc.c,v 1.27 2006/06/02 22:18:59 dsalt Exp $ * * video_out_xvmc.c, X11 video motion compensation extension interface for xine * @@ -1786,7 +1786,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_xvmc = { +static const vo_info_t vo_info_xvmc = { /* priority must be low until it supports displaying non-accelerated stuff */ 0, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 7cfea5747..1e429e94a 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -18,7 +18,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: video_out_xxmc.c,v 1.20 2006/05/03 19:46:09 dsalt Exp $ + * $Id: video_out_xxmc.c,v 1.21 2006/06/02 22:18:59 dsalt Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -2633,7 +2633,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static vo_info_t vo_info_xxmc = { +static const vo_info_t vo_info_xxmc = { /* keep priority lower than Xv for now. we may increase this * when the xxmc driver is more mature/tested. */ |