summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libffmpeg/dvaudio_decoder.c4
-rw-r--r--src/libxineadec/fooaudio.c4
-rw-r--r--src/libxineadec/gsm610.c4
-rw-r--r--src/libxineadec/nsf.c4
-rw-r--r--src/post/goom/Makefile.am7
-rw-r--r--src/post/goom/gfontrle.h7
-rw-r--r--src/post/goom/mathtools.c6
-rwxr-xr-xsrc/post/goom/mathtools.h3
-rw-r--r--src/post/goom/xine_goom.c4
9 files changed, 17 insertions, 26 deletions
diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c
index 95d6753f2..17a5638a8 100644
--- a/src/libffmpeg/dvaudio_decoder.c
+++ b/src/libffmpeg/dvaudio_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: dvaudio_decoder.c,v 1.9 2006/05/03 19:46:07 dsalt Exp $
+ * $Id: dvaudio_decoder.c,v 1.10 2006/06/02 22:13:45 dsalt Exp $
*
* dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org>
*
@@ -433,7 +433,7 @@ static uint32_t supported_audio_types[] = {
0
};
-decoder_info_t dec_info_dvaudio = {
+static const decoder_info_t dec_info_dvaudio = {
supported_audio_types, /* supported types */
5 /* priority */
};
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index faa8b88b4..0d9b01c16 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -21,7 +21,7 @@
* player. It really works too! It will output a continuous sine wave in
* place of the data it should actually send.
*
- * $Id: fooaudio.c,v 1.16 2006/05/03 19:46:08 dsalt Exp $
+ * $Id: fooaudio.c,v 1.17 2006/06/02 22:13:45 dsalt Exp $
*/
#include <stdio.h>
@@ -335,7 +335,7 @@ static uint32_t audio_types[] = {
* the priority that the plugin should be given with respect to other
* 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_audio = {
+static const decoder_info_t dec_info_audio = {
audio_types, /* supported types */
5 /* priority */
};
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index c12271142..e8f566f84 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -44,7 +44,7 @@
* Carsten Bormann
* --------------------------------------------------------------------
*
- * $Id: gsm610.c,v 1.17 2006/05/03 19:46:08 dsalt Exp $
+ * $Id: gsm610.c,v 1.18 2006/06/02 22:13:45 dsalt Exp $
*
*/
@@ -284,7 +284,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 */
9 /* priority */
};
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index 8e6ccd1b6..db906b087 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -20,7 +20,7 @@
* NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
* http://www.baisoku.org/
*
- * $Id: nsf.c,v 1.10 2006/05/03 19:46:08 dsalt Exp $
+ * $Id: nsf.c,v 1.11 2006/06/02 22:13:45 dsalt Exp $
*/
#include <stdio.h>
@@ -279,7 +279,7 @@ static uint32_t audio_types[] = {
* the priority that the plugin should be given with respect to other
* 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_audio = {
+static const decoder_info_t dec_info_audio = {
audio_types, /* supported types */
5 /* priority */
};
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index cfdd0a61e..3fd80e8a7 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -2,7 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
libdir = $(XINE_PLUGINDIR)/post
-EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch
+EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch \
+ gfontrle.c mathtools.c
## -fomit-frame-pointer segfaults here
## Use -O2 if -Os is stripped or x86 does not build
@@ -24,8 +25,8 @@ endif
xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \
config_param.c convolve_fx.c cpu_info.c drawmethods.c filters.c flying_stars_fx.c \
- gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \
- goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c mathtools.c \
+ gfontlib.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \
+ goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c \
plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS)
xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
diff --git a/src/post/goom/gfontrle.h b/src/post/goom/gfontrle.h
deleted file mode 100644
index 41e2462fd..000000000
--- a/src/post/goom/gfontrle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-extern const struct {
- unsigned int width;
- unsigned int height;
- unsigned int bytes_per_pixel;
- unsigned int rle_size;
- unsigned char rle_pixel [49725];
-} the_font ;
diff --git a/src/post/goom/mathtools.c b/src/post/goom/mathtools.c
index b2b02ea05..45f8ef0f9 100644
--- a/src/post/goom/mathtools.c
+++ b/src/post/goom/mathtools.c
@@ -8,9 +8,7 @@
*/
/*---------------------------------------------------------------------------*/
-#include "mathtools.h"
-
-float sin256[256] = {
+static const float sin256[256] = {
0,0.0245412,0.0490677,0.0735646,0.0980171,0.122411,0.14673,0.170962
,0.19509,0.219101,0.24298,0.266713,0.290285,0.313682,0.33689,0.359895
,0.382683,0.405241,0.427555,0.449611,0.471397,0.492898,0.514103,0.534998
@@ -46,7 +44,7 @@ float sin256[256] = {
};
-float cos256[256] = {
+static const float cos256[256] = {
0,0.999699,0.998795,0.99729,0.995185,0.99248,0.989177,0.985278
,0.980785,0.975702,0.970031,0.963776,0.95694,0.949528,0.941544,0.932993
,0.92388,0.91421,0.903989,0.893224,0.881921,0.870087,0.857729,0.844854
diff --git a/src/post/goom/mathtools.h b/src/post/goom/mathtools.h
index 0e2293c3f..165fc66b0 100755
--- a/src/post/goom/mathtools.h
+++ b/src/post/goom/mathtools.h
@@ -29,8 +29,7 @@
#define SINCOS(f,s,c) {s=sin(f);c=cos(f);}
#endif
-extern float sin256[256];
-extern float cos256[256];
+#include "mathtools.c"
#endif
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 891228489..c9cfb69a0 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.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_goom.c,v 1.60 2006/05/03 19:46:08 dsalt Exp $
+ * $Id: xine_goom.c,v 1.61 2006/06/02 22:13:45 dsalt Exp $
*
* GOOM post plugin.
*
@@ -108,7 +108,7 @@ static void *goom_init_plugin(xine_t *xine, void *);
/* plugin catalog information */
-const post_info_t goom_special_info = {
+static const post_info_t goom_special_info = {
XINE_POST_TYPE_AUDIO_VISUALIZATION
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:33:48 +0000