summaryrefslogtreecommitdiff
path: root/src/post/goom
diff options
context:
space:
mode:
Diffstat (limited to 'src/post/goom')
-rw-r--r--src/post/goom/Makefile.am2
-rw-r--r--src/post/goom/filters.c18
-rw-r--r--src/post/goom/goom_core.c4
-rw-r--r--src/post/goom/goom_core.h4
-rw-r--r--src/post/goom/ifs.c2
-rw-r--r--src/post/goom/ifs.h2
-rw-r--r--src/post/goom/ifs_display.c4
-rw-r--r--src/post/goom/lines.c10
-rw-r--r--src/post/goom/zoom_filter_mmx.c7
-rw-r--r--src/post/goom/zoom_filter_mmx.h9
10 files changed, 35 insertions, 27 deletions
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 76aee8ca8..1d35308b5 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -29,3 +29,5 @@ xineplug_post_goom_la_SOURCES = xine_goom.c \
xineplug_post_goom_la_LIBADD = $(XINE_LIB)
xineplug_post_goom_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+
+noinst_HEADERS = zoom_filter_mmx.h
diff --git a/src/post/goom/filters.c b/src/post/goom/filters.c
index e2aad6466..4628bc0aa 100644
--- a/src/post/goom/filters.c
+++ b/src/post/goom/filters.c
@@ -36,10 +36,7 @@ extern volatile int use_asm;
#ifdef MMX
/*int mmx_zoom () ;*/
-void zoom_filter_mmx (int prevX, int prevY,
- unsigned int *expix1, unsigned int *expix2,
- int *brutS, int *brutD, int buffratio,
- int precalCoef[16][16]);
+#include "zoom_filter_mmx.h"
#endif /* MMX */
@@ -106,7 +103,7 @@ static int *firedec = 0;
/* retourne x>>s , en testant le signe de x */
-int ShiftRight (int x, const unsigned char s)
+static int ShiftRight (int x, const unsigned char s)
{
if (x < 0)
return -(-x >> s);
@@ -118,7 +115,7 @@ int ShiftRight (int x, const unsigned char s)
/** modif d'optim by Jeko : precalcul des 4 coefs résultant des 2 pos */
int precalCoef[16][16];
-void generatePrecalCoef ()
+static void generatePrecalCoef (void)
{
static int firstime = 1;
@@ -173,7 +170,7 @@ void generatePrecalCoef ()
px et py indique la nouvelle position (en sqrtperte ieme de pixel)
(valeur * 16)
*/
-void calculatePXandPY (int x, int y, int *px, int *py)
+static void calculatePXandPY (int x, int y, int *px, int *py)
{
if (theMode == WATER_MODE) {
static int wave = 0;
@@ -311,7 +308,7 @@ void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c)
}
-void setPixelRGB_ (Uint * buffer, Uint x, Color c)
+static void setPixelRGB_ (Uint * buffer, Uint x, Color c)
{
#ifdef _DEBUG
if (x >= resolx * c_resoly) {
@@ -363,7 +360,7 @@ void getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c)
}
-void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
+static void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
{
register unsigned char *tmp8;
@@ -390,8 +387,7 @@ void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
}
-void
-c_zoom ()
+static void c_zoom (void)
{
int myPos, myPos2;
Color couleur;
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index 3c467b875..fb9dbac9a 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -761,7 +761,7 @@ goom_update (gint16 data[2][512],
}
void
-goom_close ()
+goom_close (void)
{
if (pixel != NULL)
free (pixel);
@@ -955,7 +955,7 @@ void goom_setAsmUse (int useIt)
use_asm = useIt;
}
-int goom_getAsmUse ()
+int goom_getAsmUse (void)
{
return use_asm;
}
diff --git a/src/post/goom/goom_core.h b/src/post/goom/goom_core.h
index 5c5efd286..343285891 100644
--- a/src/post/goom/goom_core.h
+++ b/src/post/goom/goom_core.h
@@ -33,11 +33,11 @@ void goom_set_resolution (guint32 resx, guint32 resy, int cinemascope);
guint32 *goom_update (gint16 data[2][512], int forceMode, float fps,
char *songTitle, char *message);
-void goom_close ();
+void goom_close (void);
void goom_set_font (int ***chars, int *width, int *height);
void goom_setAsmUse (int useIt);
-int goom_getAsmUse ();
+int goom_getAsmUse (void);
#endif
diff --git a/src/post/goom/ifs.c b/src/post/goom/ifs.c
index 40037b6b7..fa1c2c190 100644
--- a/src/post/goom/ifs.c
+++ b/src/post/goom/ifs.c
@@ -538,7 +538,7 @@ draw_ifs ( /* ModeInfo * mi */ int *nbpt)
/***************************************************************/
void
-release_ifs ()
+release_ifs (void)
{
if (Root != NULL) {
(void) free ((void *) Root);
diff --git a/src/post/goom/ifs.h b/src/post/goom/ifs.h
index c91df183a..9cb19514f 100644
--- a/src/post/goom/ifs.h
+++ b/src/post/goom/ifs.h
@@ -22,7 +22,7 @@ void ifs_update (guint32 * buffer, guint32 * back, int width, int height,
int increment);
/* free all ifs's data. */
-void release_ifs ();
+void release_ifs (void);
/* DONT USE !!! deprecated
diff --git a/src/post/goom/ifs_display.c b/src/post/goom/ifs_display.c
index 53530ccf6..c3d3783f3 100644
--- a/src/post/goom/ifs_display.c
+++ b/src/post/goom/ifs_display.c
@@ -5,7 +5,7 @@
extern volatile int use_asm;
#ifdef MMX
-void
+static void
ifs_fun_mmx(guint32 * data, guint32 * back, int width, int height,
int increment, int nbpt, IFSPoint *points, int couleursl)
{
@@ -27,7 +27,7 @@ ifs_fun_mmx(guint32 * data, guint32 * back, int width, int height,
}
#endif
-void
+static void
ifs_fun_c(guint32 * data, guint32 * back, int width, int height,
int increment, int nbpt, IFSPoint *points, int couleursl)
{
diff --git a/src/post/goom/lines.c b/src/post/goom/lines.c
index 7cda48ef4..e7a9b60e0 100644
--- a/src/post/goom/lines.c
+++ b/src/post/goom/lines.c
@@ -201,7 +201,7 @@ draw_line (int *data, int x1, int y1, int x2, int y2, int col, int screenx,
}
}
-void
+static void
genline (int id, float param, GMUnitPointer * l, int rx, int ry)
{
int i;
@@ -235,7 +235,7 @@ genline (int id, float param, GMUnitPointer * l, int rx, int ry)
}
}
-guint32 getcouleur (int mode)
+static guint32 getcouleur (int mode)
{
switch (mode) {
case GML_RED:
@@ -268,7 +268,7 @@ goom_lines_set_res (GMLine * gml, int rx, int ry)
}
-void
+static void
goom_lines_move (GMLine * l)
{
int i;
@@ -314,7 +314,7 @@ goom_lines_switch_to (GMLine * gml, int IDdest, float param, int col)
/* printf ("couleur %d : %x\n",col,gml->color2); */
}
-inline unsigned char
+static inline unsigned char
lighten (unsigned char value, float power)
{
int val = value;
@@ -333,7 +333,7 @@ lighten (unsigned char value, float power)
}
}
-void
+static void
lightencolor (int *col, float power)
{
unsigned char *color;
diff --git a/src/post/goom/zoom_filter_mmx.c b/src/post/goom/zoom_filter_mmx.c
index eb364ac86..de8a37096 100644
--- a/src/post/goom/zoom_filter_mmx.c
+++ b/src/post/goom/zoom_filter_mmx.c
@@ -1,5 +1,6 @@
#include "goom_config.h"
#include "xineutils.h"
+#include "zoom_filter_mmx.h"
#ifdef MMX
#define BUFFPOINTNB 16
@@ -13,9 +14,9 @@
#define PERTEDEC 4
void zoom_filter_mmx (int prevX, int prevY,
- unsigned int *expix1, unsigned int *expix2,
- int *brutS, int *brutD, int buffratio,
- int precalCoef[16][16])
+ unsigned int *expix1, unsigned int *expix2,
+ int *brutS, int *brutD, int buffratio,
+ int precalCoef[16][16])
{
unsigned int ax = (prevX-1)<<PERTEDEC, ay = (prevY-1)<<PERTEDEC;
diff --git a/src/post/goom/zoom_filter_mmx.h b/src/post/goom/zoom_filter_mmx.h
new file mode 100644
index 000000000..f81f2dca7
--- /dev/null
+++ b/src/post/goom/zoom_filter_mmx.h
@@ -0,0 +1,9 @@
+#ifndef ZOOM_FILTER_MMX_H
+#define ZOOM_FILTER_MMX_H
+
+void zoom_filter_mmx (int prevX, int prevY,
+ unsigned int *expix1, unsigned int *expix2,
+ int *brutS, int *brutD, int buffratio,
+ int precalCoef[16][16]);
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 07:19:39 +0000