Commit d6258153 authored by Andy Wingo Wingo's avatar Andy Wingo Wingo

removal of //-style comments don't link plugins to core libs -- the versioning...

removal of //-style comments don't link plugins to core libs -- the versioning is done internally to the plugins with...

Original commit message from CVS:
* removal of //-style comments
* don't link plugins to core libs -- the versioning is done internally to the plugins with the plugin_info struct,
and symbol resolution is lazy, so we can always know if a plugin can be loaded by the plugin_info data. in theory.
parent 0f1d7549
......@@ -10,7 +10,7 @@ BUILT_SOURCES = \
libgstidentity2_la_SOURCES = gst-identity2.gob $(GOB_FILES_ID)
libgstidentity2_la_CFLAGS = $(GST_CFLAGS)
libgstidentity2_la_LIBADD = $(GST_LIBS)
libgstidentity2_la_LIBADD =
%.c %.h %-private.h: %.gob
gob $<
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstaasink.la
libgstaasink_la_SOURCES = gstaasink.c
libgstaasink_la_CFLAGS = $(GST_CFLAGS) $(AALIB_CFLAGS)
libgstaasink_la_LIBADD = $(GST_LIBS) $(AALIB_LIBS)
libgstaasink_la_LIBADD = $(AALIB_LIBS)
libgstaasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstaasink.h
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstdvdec.la
libgstdvdec_la_SOURCES = gstdvdec.c
libgstdvdec_la_CFLAGS = $(GST_CFLAGS)
libgstdvdec_la_LIBADD = $(GST_LIBS) $(DV_LIBS)
libgstdvdec_la_LIBADD = $(DV_LIBS)
libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdvdec.h
......
......@@ -15,7 +15,7 @@ main (int argc,char *argv[])
GstElement *bin;
GstElement *src;
GstElement *dvdec;
//GstElement *cspace;
/*GstElement *cspace; */
GstElement *deint;
GstElement *videosink;
......@@ -40,7 +40,7 @@ main (int argc,char *argv[])
}
dvdec = gst_elementfactory_make ("dvdec", "decoder");
if (!dvdec) fprintf(stderr,"no dvdec\n"),exit(1);
// cspace = gst_elementfactory_make ("colorspace", "cspace");
/* cspace = gst_elementfactory_make ("colorspace", "cspace"); */
deint = gst_elementfactory_make ("deinterlace", "deinterlace");
videosink = gst_elementfactory_make ("xvideosink", "videosink");
if (!videosink) fprintf(stderr,"no dvdec\n"),exit(1);
......@@ -48,12 +48,12 @@ main (int argc,char *argv[])
gst_bin_add(GST_BIN(bin),GST_ELEMENT(src));
gst_bin_add(GST_BIN(bin),GST_ELEMENT(dvdec));
// gst_bin_add(GST_BIN(bin),GST_ELEMENT(cspace));
/* gst_bin_add(GST_BIN(bin),GST_ELEMENT(cspace)); */
gst_bin_add(GST_BIN(bin),GST_ELEMENT(videosink));
gst_element_connect(src,"src",dvdec,"sink");
// gst_element_connect(cspace,"src",videosink,"sink");
// gst_element_connect(dvdec,"video",cspace,"sink");
/* gst_element_connect(cspace,"src",videosink,"sink"); */
/* gst_element_connect(dvdec,"video",cspace,"sink"); */
gst_element_connect(dvdec,"video",deint,"sink");
gst_element_connect(deint,"src",videosink,"sink");
......@@ -62,7 +62,7 @@ main (int argc,char *argv[])
vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox1);
button = gtk_button_new_with_label(_("test"));//_with_label (_("chup"));
button = gtk_button_new_with_label(_("test"));/*_with_label (_("chup")); */
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (vbox1), button, FALSE, FALSE, 0);
......
......@@ -142,7 +142,7 @@ static GstElementClass *parent_class = NULL;
/* This array holds the ids of the signals registered for this object.
* The array indexes are based on the enum up above.
*/
//static guint gst_dvdec_signals[LAST_SIGNAL] = { 0 };
/*static guint gst_dvdec_signals[LAST_SIGNAL] = { 0 }; */
/* This function is used to register and subsequently return the type
* identifier for this object class. On first invocation, it will
......@@ -198,7 +198,7 @@ gst_dvdec_class_init (GstDVDecClass *klass)
gstelement_class->change_state = gst_dvdec_change_state;
// table initialization, only do once
/* table initialization, only do once */
dv_init();
}
......
......@@ -4,12 +4,12 @@ plugin_LTLIBRARIES = libesdsink.la libesdmon.la
libesdsink_la_SOURCES = esdsink.c
libesdsink_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS)
libesdsink_la_LIBADD = $(GST_LIBS) $(ESD_LIBS)
libesdsink_la_LIBADD = $(ESD_LIBS)
libesdsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libesdmon_la_SOURCES = esdmon.c
libesdmon_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS)
libesdmon_la_LIBADD = $(GST_LIBS) $(ESD_LIBS)
libesdmon_la_LIBADD = $(ESD_LIBS)
libesdmon_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = esdsink.h
......
......@@ -210,10 +210,10 @@ gst_esdmon_class_init (GstEsdmonClass *klass)
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BYTESPERREAD,
g_param_spec_ulong("bytes_per_read","bytes_per_read","bytes_per_read",
0,G_MAXULONG,0,G_PARAM_READWRITE)); // CHECKME
0,G_MAXULONG,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CUROFFSET,
g_param_spec_ulong("curoffset","curoffset","curoffset",
0,G_MAXULONG,0,G_PARAM_READABLE)); // CHECKME
0,G_MAXULONG,0,G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DEPTH,
g_param_spec_enum("depth","depth","depth",
GST_TYPE_ESDMON_DEPTHS,16,G_PARAM_READWRITE)); /* CHECKME! */
......@@ -299,9 +299,9 @@ gst_esdmon_get (GstPad *pad)
"oss_src",
"audio/raw",
"format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0), //FIXME
"endianness", GST_PROPS_INT (G_BYTE_ORDER), //FIXME
"signed", GST_PROPS_BOOLEAN (TRUE), //FIXME
"law", GST_PROPS_INT (0), /*FIXME */
"endianness", GST_PROPS_INT (G_BYTE_ORDER), /*FIXME */
"signed", GST_PROPS_BOOLEAN (TRUE), /*FIXME */
"width", GST_PROPS_INT (esdmon->depth),
"depth", GST_PROPS_INT (esdmon->depth),
"rate", GST_PROPS_INT (esdmon->frequency),
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstflac.la
libgstflac_la_SOURCES = gstflac.c gstflacenc.c gstflacdec.c
libgstflac_la_CFLAGS = $(GST_CFLAGS)
libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS)
libgstflac_la_LIBADD = $(FLAC_LIBS)
libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstflacenc.h gstflacdec.h
......@@ -20,7 +20,7 @@
#include <string.h>
#include <sys/soundcard.h>
//#define DEBUG_ENABLED
/*#define DEBUG_ENABLED */
#include "gstflacdec.h"
......@@ -65,7 +65,7 @@ static FLAC__StreamDecoderWriteStatus gst_flacdec_write (const FLAC__StreamDec
void *client_data);
static GstElementClass *parent_class = NULL;
//static guint gst_flacdec_signals[LAST_SIGNAL] = { 0 };
/*static guint gst_flacdec_signals[LAST_SIGNAL] = { 0 }; */
GType
flacdec_get_type(void) {
......@@ -153,7 +153,7 @@ gst_flacdec_read (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsig
}
if (*bytes < insize) {
// we have more than we can handle
/* we have more than we can handle */
flacdec->data_left = inbuf;
flacdec->offset_left += *bytes;
inbuf = NULL;
......
......@@ -60,7 +60,7 @@ static void gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder,
void *client_data);
static GstElementClass *parent_class = NULL;
//static guint gst_flacenc_signals[LAST_SIGNAL] = { 0 };
/*static guint gst_flacenc_signals[LAST_SIGNAL] = { 0 }; */
GType
flacenc_get_type (void)
......@@ -95,7 +95,7 @@ gst_flacenc_class_init (FlacEncClass *klass)
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
// we have no properties atm so this is a bit silly
/* we have no properties atm so this is a bit silly */
gobject_class->set_property = gst_flacenc_set_property;
gobject_class->get_property = gst_flacenc_get_property;
}
......
......@@ -6,7 +6,7 @@ libgstjpeg_la_SOURCES = gstjpeg.c gstjpegdec.c gstjpegenc.c
libgstjpeg_la_CFLAGS = $(GST_CFLAGS)
## FIXME: check these CFLAGS
## -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS)
libgstjpeg_la_LIBADD = $(JPEG_LIBS)
libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstjpegdec.h gstjpegenc.h
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstladspa.la
libgstladspa_la_SOURCES = gstladspa.c search.c load.c
libgstladspa_la_CFLAGS = $(GST_CFLAGS)
libgstladspa_la_LIBADD = $(GST_LIBS)
libgstladspa_la_LIBADD =
libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstladspa.h ladspa.h utils.h
......@@ -492,7 +492,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP
/*
if (id == ARG_LOOP_BASED) {
// we can only do this in NULL state
* we can only do this in NULL state *
g_return_if_fail (GST_STATE(object) != GST_STATE_NULL);
ladspa->loopbased = g_value_get_boolean (value);
if (ladspa->loopbased) {
......
......@@ -98,9 +98,9 @@ LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction) {
pcLADSPAPath = getenv("LADSPA_PATH");
if (!pcLADSPAPath) {
// fprintf(stderr,
// "Warning: You do not have a LADSPA_PATH "
// "environment variable set.\n");
/* fprintf(stderr, */
/* "Warning: You do not have a LADSPA_PATH " */
/* "environment variable set.\n"); */
return;
}
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstmikmod.la
libgstmikmod_la_SOURCES = gstmikmod.c drv_gst.c mikmod_reader.c mikmod_types.c
libgstmikmod_la_CFLAGS = $(GST_CFLAGS) $(MIKMOD_CFLAGS)
libgstmikmod_la_LIBADD = $(GST_LIBS) $(MIKMOD_LIBS)
libgstmikmod_la_LIBADD = $(MIKMOD_LIBS)
libgstmikmod_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstmikmod.h
......
......@@ -535,7 +535,7 @@ gst_mikmod_set_property (GObject *object, guint id, const GValue *value, GParamS
filter->stereo = g_value_get_boolean (value);
break;
default:
// G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
/* G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); */
break;
}
}
......@@ -593,7 +593,7 @@ gst_mikmod_get_property (GObject *object, guint id, GValue *value, GParamSpec *p
g_value_set_boolean (value, filter->stereo);
break;
default:
// G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
/* G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); */
break;
}
}
......
......@@ -80,7 +80,7 @@ int need_sync;
GType gst_mikmod_get_type(void);
// symbols for mikmod_reader.h
/* symbols for mikmod_reader.h */
struct _GST_READER
{
MREADER core;
......@@ -95,7 +95,7 @@ typedef struct _GST_READER GST_READER;
MREADER *GST_READER_new( GstMikMod *mik );
// symbols for drv_gst.c
/* symbols for drv_gst.c */
extern MDRIVER drv_gst;
#ifdef __cplusplus
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgst1394.la
libgst1394_la_SOURCES = gst1394.c gstdv1394src.c
libgst1394_la_CFLAGS = $(GST_CFLAGS)
libgst1394_la_LIBADD = $(GST_LIBS) $(raw1394_LIBS)
libgst1394_la_LIBADD = $(raw1394_LIBS)
libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdv1394src.h
......@@ -63,7 +63,7 @@ static GstElementStateReturn gst_dv1394src_change_state (GstElement *element);
static GstBuffer * gst_dv1394src_get (GstPad *pad);
static GstElementClass *parent_class = NULL;
//static guint gst_filter_signals[LAST_SIGNAL] = { 0 };
/*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_dv1394src_get_type(void) {
......@@ -152,7 +152,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad
GstBuffer *buf;
if (len > 16) {
//fprintf(stderr,"section_type %d, dif_sequence %d, dif_block %d\n",ptr[0] >> 5,ptr[1] >> 4,ptr[2]);
/*fprintf(stderr,"section_type %d, dif_sequence %d, dif_block %d\n",ptr[0] >> 5,ptr[1] >> 4,ptr[2]); */
fprintf(stderr,".");
if (((ptr[0] >> 5) == 0) &&
((ptr[1] >> 4) == 0) && (ptr[2] == 0)) dv1394src->started = TRUE;
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstauparse.la
libgstauparse_la_SOURCES = gstauparse.c
libgstauparse_la_CFLAGS = $(GST_CFLAGS)
libgstauparse_la_LIBADD = $(GST_LIBS)
libgstauparse_la_LIBADD =
libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstauparse.h
......@@ -113,7 +113,7 @@ static void gst_auparse_init (GstAuParse *auparse);
static void gst_auparse_chain (GstPad *pad,GstBuffer *buf);
static GstElementClass *parent_class = NULL;
//static guint gst_auparse_signals[LAST_SIGNAL] = { 0 };
/*static guint gst_auparse_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_auparse_get_type (void)
......
......@@ -20,19 +20,19 @@ noinst_HEADERS = \
#CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
libgstavidemux_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
libgstavidemux_la_LIBADD = $(GST_LIBS)
libgstavidemux_la_LIBADD =
libgstavidemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstavimux_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
libgstavimux_la_LIBADD = $(GST_LIBS)
libgstavimux_la_LIBADD =
libgstavimux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaviaudiodecoder_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
libgstaviaudiodecoder_la_LIBADD = $(GST_LIBS)
libgstaviaudiodecoder_la_LIBADD =
libgstaviaudiodecoder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstcdxaparse_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
libgstcdxaparse_la_LIBADD = $(GST_LIBS)
libgstcdxaparse_la_LIBADD =
libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = README_win32dll README
......@@ -233,7 +233,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux)
avi_demux->state = GST_AVI_DEMUX_UNKNOWN;
avi_demux->num_audio_pads = 0;
avi_demux->num_video_pads = 0;
//avi_demux->next_time = 500000;
/*avi_demux->next_time = 500000; */
avi_demux->next_time = 0;
avi_demux->init_audio = 0;
avi_demux->flags = 0;
......@@ -803,7 +803,7 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
chunkid, *chunksize);
if (avi_demux->init_audio) {
//avi_demux->next_time += (*chunksize) * 1000000LL / avi_demux->audio_rate;
/*avi_demux->next_time += (*chunksize) * 1000000LL / avi_demux->audio_rate; */
avi_demux->init_audio--;
}
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstcutter.la
libgstcutter_la_SOURCES = gstcutter.c
libgstcutter_la_CFLAGS = $(GST_CFLAGS)
libgstcutter_la_LIBADD = $(GST_LIBS)
libgstcutter_la_LIBADD =
libgstcutter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstcutter.h filter.func
......
......@@ -120,17 +120,17 @@ gst_cutter_class_init (GstCutterClass *klass)
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_THRESHOLD,
g_param_spec_double ("threshold", "threshold", "threshold",
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); // CHECKME
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_THRESHOLD_DB,
g_param_spec_double ("threshold_dB", "threshold_dB", "threshold_dB",
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); // CHECKME
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RUN_LENGTH,
g_param_spec_double ("runlength", "runlength", "runlength",
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); // CHECKME
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PRE_LENGTH,
g_param_spec_double ("prelength", "prelength", "prelength",
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); // CHECKME
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); /* CHECKME */
gst_cutter_signals[CUT_START] =
g_signal_new ("cut_start", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GstCutterClass, cut_start), NULL, NULL,
......@@ -214,7 +214,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
/* if RMS below threshold, add buffer length to silent run length count
* if not, reset
*/
//g_print ("DEBUG: cutter: ms %f, RMS %f\n", ms, RMS);
/*g_print ("DEBUG: cutter: ms %f, RMS %f\n", ms, RMS); */
if (RMS < filter->threshold_level)
filter->silent_run_length += gst_audio_length (filter->srcpad, buf);
else
......@@ -234,12 +234,12 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
{
if (filter->silent)
{
// g_print ("DEBUG: cutter: cut to here, turning off out\n");
/* g_print ("DEBUG: cutter: cut to here, turning off out\n"); */
gtk_signal_emit (G_OBJECT (filter), gst_cutter_signals[CUT_STOP]);
}
else
{
// g_print ("DEBUG: cutter: start from here, turning on out\n");
/* g_print ("DEBUG: cutter: start from here, turning on out\n"); */
/* first of all, flush current buffer */
gtk_signal_emit (G_OBJECT (filter), gst_cutter_signals[CUT_START]);
g_print ("DEBUG: cutter: flushing buffer ");
......@@ -386,7 +386,7 @@ gst_cutter_get_caps (GstPad *pad, GstCutter* filter)
GstCaps *caps = NULL;
caps = GST_PAD_CAPS (pad);
// FIXME : Please change this to a better warning method !
/* FIXME : Please change this to a better warning method ! */
if (caps == NULL)
printf ("WARNING: cutter: get_caps: Could not get caps of pad !\n");
filter->width = gst_caps_get_int (caps, "width");
......
......@@ -24,7 +24,7 @@
#include <config.h>
#include <gst/gst.h>
// #include <gst/meta/audioraw.h>
/* #include <gst/meta/audioraw.h> */
#ifdef __cplusplus
......
......@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstflxdec.la
libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c
libgstflxdec_la_CFLAGS = $(GST_CFLAGS)
libgstflxdec_la_LIBADD = $(GST_LIBS)
libgstflxdec_la_LIBADD =
libgstflxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = flx_fmt.h flx_color.h gstflxdec.h
......
......@@ -16,7 +16,7 @@ noinst_HEADERS = filters.h goom_core.h goom_tools.h graphic.h lines.h
#CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
libgstgoom_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
libgstgoom_la_LIBADD = $(GST_LIBS)
libgstgoom_la_LIBADD =
libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = filters.c filters_mmx.s
......
......@@ -10,7 +10,7 @@
* la vitesse est maintenant comprise dans [0..128] au lieu de [0..100]
*/
//#define _DEBUG_PIXEL;
/*#define _DEBUG_PIXEL; */
#include "filters.h"
#include "graphic.h"
......@@ -51,8 +51,8 @@ unsigned int ppcsize4;
#endif /* PowerPC */
unsigned int *coeffs = 0, *freecoeffs = 0;
guint32 *expix1 = 0; // pointeur exporte vers p1
guint32 *expix2 = 0; // pointeur exporte vers p2
guint32 *expix1 = 0; /* pointeur exporte vers p1 */
guint32 *expix2 = 0; /* pointeur exporte vers p2 */
guint32 zoom_width;
#endif /* ASM */
......@@ -70,7 +70,7 @@ static unsigned char sqrtperte = 16 ;
static int * firedec = 0 ;
// retourne x>>s , en testant le signe de x
/* retourne x>>s , en testant le signe de x */
inline int ShiftRight (int x, const unsigned char s)
{
if (x<0)
......@@ -151,16 +151,16 @@ inline void calculatePXandPY (int x, int y, int *px, int *py)
}
}
//#define _DEBUG
/*#define _DEBUG */
inline void setPixelRGB(Uint *buffer, Uint x, Uint y, Color c)
{
// buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b
/* buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */
#ifdef _DEBUG_PIXEL
if ( x+y*resolx >= resolx * resoly)
{
fprintf (stderr,"setPixel ERROR : hors du tableau... %i, %i\n", x,y) ;
//exit (1) ;
/*exit (1) ; */
}
#endif
......@@ -214,7 +214,7 @@ inline void getPixelRGB (Uint *buffer, Uint x, Uint y, Color *c)
c->b = *(unsigned char *)(tmp8 = (unsigned char*)(buffer + (x + y*resolx)));
c->v = *(unsigned char *)(++tmp8);
c->r = *(unsigned char *)(++tmp8);
// *c = (Color) buffer[x+y*WIDTH] ;
/* *c = (Color) buffer[x+y*WIDTH] ; */
#endif
}
......@@ -242,7 +242,7 @@ inline void getPixelRGB_ (Uint *buffer, Uint x, Color *c)
c->b = *(unsigned char *)(tmp8 = (unsigned char*)(buffer + x));
c->v = *(unsigned char *)(++tmp8);
c->r = *(unsigned char *)(++tmp8);
// *c = (Color) buffer[x+y*WIDTH] ;
/* *c = (Color) buffer[x+y*WIDTH] ; */
#endif
}
......@@ -255,14 +255,14 @@ void zoomFilterFastRGB (Uint *pix1,
{
static guint32 prevX = 0, prevY = 0;
static char reverse = 0 ; //vitesse invers..(zoom out)
// static int perte = 100; // 100 = normal
static char reverse = 0 ; /*vitesse invers..(zoom out) */
/* static int perte = 100; // 100 = normal */
static unsigned char pertedec = 8 ;
static char firstTime = 1;
Uint x, y;
// static unsigned int prevX = 0, prevY = 0;
/* static unsigned int prevX = 0, prevY = 0; */
#ifdef USE_ASM
expix1 = pix1 ;
......@@ -322,7 +322,7 @@ void zoomFilterFastRGB (Uint *pix1,
if (firstTime || zf)
{
// generation d'une table de sinus
/* generation d'une table de sinus */
if (firstTime)
{
unsigned short us ;
......@@ -387,15 +387,15 @@ void zoomFilterFastRGB (Uint *pix1,
}
// generation du buffer
/* generation du buffer */
for (y = 0 ; y < prevY ; y++)
for (x = 0; x < prevX ; x++)
{
int px,py;
unsigned char coefv,coefh;
// calculer px et py en fonction de
// x,y,middleX,middleY et theMode
/* calculer px et py en fonction de */
/* x,y,middleX,middleY et theMode */
calculatePXandPY (x,y,&px, &py) ;
if ((px == x << 4) && (py == y << 4))
py += 8 ;
......
......@@ -5,7 +5,7 @@
#include "filters.h"
#include "lines.h"
//#define VERBOSE
/*#define VERBOSE */
#ifdef VERBOSE
#include <stdio.h>
......@@ -63,21 +63,21 @@ void goom_set_resolution (guint32 resx, guint32 resy)
guint32 * goom_update (gint16 data [2][512])
{
static int lockvar = 0 ; // pour empecher de nouveaux changements
static int goomvar = 0 ; // boucle des gooms
static int totalgoom = 0 ; // nombre de gooms par seconds
static int agoom = 0 ; // un goom a eu lieu..
static int loopvar = 0 ; // mouvement des points
static int speedvar = 0 ; // vitesse des particules
static int lineMode = 0 ; // l'effet lineaire a dessiner
static int lockvar = 0 ; /* pour empecher de nouveaux changements */
static int goomvar = 0 ; /* boucle des gooms */
static int totalgoom = 0 ; /* nombre de gooms par seconds */
static int agoom = 0 ; /* un goom a eu lieu.. */
static int loopvar = 0 ; /* mouvement des points */
static int speedvar = 0 ; /* vitesse des particules */
static int lineMode = 0 ; /* l'effet lineaire a dessiner */
guint32 * return_val;
guint32 pointWidth;
guint32 pointHeight;
int incvar ; // volume du son
int accelvar ; // acceleration des particules
int incvar ; /* volume du son */
int accelvar ; /* acceleration des particules */
int i ;
float largfactor ; // elargissement de l'intervalle d'volution des points
static char goomlimit = 2 ; // sensibilit du goom
float largfactor ; /* elargissement de l'intervalle d'volution des points */
static char goomlimit = 2 ; /* sensibilit du goom */
static ZoomFilterData zfd =
{
128, 8, 16,
......@@ -143,26 +143,26 @@ guint32 * goom_update (gint16 data [2][512])
66.0f, 74.0f, loopvar + i * 500);
}
// par dfaut pas de changement de zoom
/* par dfaut pas de changement de zoom */
pzfd = NULL ;
// diminuer de 1 le temps de lockage
// note pour ceux qui n'ont pas suivis : le lockvar permet d'empecher un
// changement d'etat du plugins juste apres un autre changement d'etat. oki ?
/* diminuer de 1 le temps de lockage */
/* note pour ceux qui n'ont pas suivis : le lockvar permet d'empecher un */
/* changement d'etat du plugins juste apres un autre changement d'etat. oki ? */
if (--lockvar < 0) lockvar = 0 ;
// temps du goom
/* temps du goom */
if (--agoom < 0) agoom = 0 ;
// on verifie qu'il ne se pas un truc interressant avec le son.
/* on verifie qu'il ne se pas un truc interressant avec le son. */
if ((accelvar>goomlimit) || (accelvar<-goomlimit))
{
// UN GOOM !!! YAHOO !
/* UN GOOM !!! YAHOO ! */
totalgoom ++ ;
agoom = 20 ; // mais pdt 20 cycles, il n'y en aura plus.
lineMode = (lineMode + 1)%20; // Tous les 10 gooms on change de mode lineaire
agoom = 20 ; /* mais pdt 20 cycles, il n'y en aura plus. */
lineMode = (lineMode + 1)%20; /* Tous les 10 gooms on change de mode lineaire */
// changement eventuel de mode
/* changement eventuel de mode */
switch (iRAND(10))
{
case 0:
......@@ -190,20 +190,20 @@ guint32 * goom_update (gint16 data [2][512])
}
}
// tout ceci ne sera fait qu'en cas de non-blocage
/* tout ceci ne sera fait qu'en cas de non-blocage */
if (lockvar == 0)
{
// reperage de goom (acceleration forte de l'acceleration du volume)
// -> coup de boost de la vitesse si besoin..
/* reperage de goom (acceleration forte de l'acceleration du volume) */
/* -> coup de boost de la vitesse si besoin.. */
if ( (accelvar>goomlimit) || (accelvar<-goomlimit) )
{
goomvar ++ ;
//if (goomvar % 1 == 0)
/*if (goomvar % 1 == 0) */
{
guint32 vtmp ;
guint32 newvit ;
newvit = STOP_SPEED - speedvar / 2 ;
// retablir le zoom avant..
/* retablir le zoom avant.. */
if ((zfd.reverse) &&
(!(cycle%12)) &&
(rand ()%3==0))
......@@ -218,7 +218,7 @@ guint32 * goom_update (gint16 data [2][512])
lockvar = 100;
}
// changement de milieu..
/* changement de milieu.. */
switch (iRAND(20))
{
case 0:
......@@ -299,7 +299,7 @@ guint32 * goom_update (gint16 data [2][512])
zfd.hPlaneEffect = iRAND (2) ? 0 : zfd.hPlaneEffect;
}
if (newvit < zfd.vitesse) // on accelere
if (newvit < zfd.vitesse) /* on accelere */
{
pzfd = &zfd;
if ( ( (newvit < STOP_SPEED - 7) &&
......@@ -318,7 +318,7 @@ guint32 * goom_update (gint16 data [2][512])
}
}
}
// mode mega-lent
/* mode mega-lent */
if (iRAND(1000) == 0)
{
/*
......@@ -333,7 +333,7 @@ guint32 * goom_update (gint16 data [2][512])
}
}
// gros frein si la musique est calme
/* gros frein si la musique est calme */
if ((speedvar < 1) && (zfd.vitesse < STOP_SPEED - 4) && (cycle % 16 == 0))
{
/*
......@@ -349,7 +349,7 @@ guint32 * goom_update (gint16 data [2][512])
*/
}
// baisser regulierement la vitesse...
/* baisser regulierement la vitesse... */
if ( (cycle % 73 == 0) && (zfd.vitesse < STOP_SPEED - 5))
{
/*
......@@ -359,7 +359,7 @@ guint32 * goom_update (gint16 data [2][512])
zfd.vitesse ++ ;
}
// arreter de decrmenter au bout d'un certain temps
/* arreter de decrmenter au bout d'un certain temps */
if ((cycle % 101 == 0) && (zfd.pertedec == 7))
{
pzfd = &zfd ;
......@@ -374,10 +374,10 @@ guint32 * goom_update (gint16 data [2][512])
}
#endif
// Zoom here !
/* Zoom here ! */
zoomFilterFastRGB (p1, p2, pzfd, resolx, resoly) ;
// si on est dans un goom : afficher les lignes...
/* si on est dans un goom : afficher les lignes... */
if (agoom > 15) goom_lines
(data,
((zfd.middleX==resolx/2) && (zfd.middleY==resoly/2) && (zfd.mode!=WATER_MODE))
......@@ -389,16 +389,16 @@ guint32 * goom_update (gint16 data [2][512])