summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Dennedy <dan@dennedy.org>2016-09-01 18:03:38 (GMT)
committer Dan Dennedy <dan@dennedy.org>2016-09-01 18:03:38 (GMT)
commit073422c90a05fd1e1b6f5681b513ec7d80319382 (patch)
treea13e89796238b2ad247ab861b6227d6bfce7f7bc
parentb63f5db473ce280f8532e2eb6f4f6a5df9b7af91 (diff)
Remove extra input params from C++ update() methods.
-rw-r--r--include/frei0r.hpp36
-rw-r--r--src/filter/baltan/baltan.cpp8
-rw-r--r--src/filter/bluescreen0r/bluescreen0r.cpp6
-rw-r--r--src/filter/cartoon/cartoon.cpp4
-rw-r--r--src/filter/d90stairsteppingfix/d90stairsteppingfix.cpp6
-rw-r--r--src/filter/delay0r/delay0r.cpp4
-rw-r--r--src/filter/delaygrab/delaygrab.cpp8
-rw-r--r--src/filter/edgeglow/edgeglow.cpp4
-rw-r--r--src/filter/equaliz0r/equaliz0r.cpp4
-rw-r--r--src/filter/facebl0r/facebl0r.cpp8
-rw-r--r--src/filter/facedetect/facedetect.cpp4
-rw-r--r--src/filter/lightgraffiti/lightgraffiti.cpp6
-rw-r--r--src/filter/ndvi/ndvi.cpp10
-rw-r--r--src/filter/nervous/nervous.cpp8
-rw-r--r--src/filter/nosync0r/nosync0r.cpp4
-rw-r--r--src/filter/primaries/primaries.cpp4
-rw-r--r--src/filter/scanline0r/scanline0r.cpp4
-rw-r--r--src/filter/sobel/sobel.cpp4
-rw-r--r--src/filter/sopsat/sopsat.cpp4
-rw-r--r--src/filter/threelay0r/threelay0r.cpp4
-rw-r--r--src/filter/timeout/timeout.cpp4
-rw-r--r--src/filter/tutorial/tutorial.cpp4
-rw-r--r--src/filter/twolay0r/twolay0r.cpp4
-rw-r--r--src/filter/vignette/vignette.cpp4
-rw-r--r--src/generator/dem0scene/plasma.cpp12
-rw-r--r--src/generator/lissajous0r/lissajous0r.cpp5
-rw-r--r--src/generator/nois0r/nois0r.cpp5
-rw-r--r--src/generator/onecol0r/onecol0r.cpp5
-rw-r--r--src/generator/partik0l/partik0l.cpp10
-rw-r--r--src/mixer2/addition/addition.cpp3
-rw-r--r--src/mixer2/addition_alpha/addition_alpha.cpp3
-rw-r--r--src/mixer2/alphaatop/alphaatop.cpp3
-rw-r--r--src/mixer2/alphain/alphain.cpp3
-rw-r--r--src/mixer2/alphaout/alphaout.cpp3
-rw-r--r--src/mixer2/alphaover/alphaover.cpp3
-rw-r--r--src/mixer2/alphaxor/alphaxor.cpp3
-rw-r--r--src/mixer2/blend/blend.cpp3
-rw-r--r--src/mixer2/burn/burn.cpp3
-rw-r--r--src/mixer2/color_only/color_only.cpp3
-rw-r--r--src/mixer2/darken/darken.cpp3
-rw-r--r--src/mixer2/difference/difference.cpp3
-rw-r--r--src/mixer2/divide/divide.cpp3
-rw-r--r--src/mixer2/dodge/dodge.cpp3
-rw-r--r--src/mixer2/grain_extract/grain_extract.cpp3
-rw-r--r--src/mixer2/grain_merge/grain_merge.cpp3
-rw-r--r--src/mixer2/hardlight/hardlight.cpp3
-rw-r--r--src/mixer2/hue/hue.cpp3
-rw-r--r--src/mixer2/lighten/lighten.cpp3
-rw-r--r--src/mixer2/multiply/multiply.cpp3
-rw-r--r--src/mixer2/overlay/overlay.cpp3
-rw-r--r--src/mixer2/saturation/saturation.cpp3
-rw-r--r--src/mixer2/screen/screen.cpp3
-rw-r--r--src/mixer2/softlight/softlight.cpp3
-rw-r--r--src/mixer2/subtract/subtract.cpp3
-rw-r--r--src/mixer2/value/value.cpp3
-rw-r--r--src/mixer2/xfade0r/xfade0r.cpp3
56 files changed, 102 insertions, 172 deletions
diff --git a/include/frei0r.hpp b/include/frei0r.hpp
index 375f16c..2976bcb 100644
--- a/include/frei0r.hpp
+++ b/include/frei0r.hpp
@@ -170,6 +170,19 @@ namespace frei0r
public:
virtual unsigned int effect_type(){ return F0R_PLUGIN_TYPE_SOURCE; }
+ virtual void update(double time, uint32_t* out) = 0;
+
+ private:
+ virtual void update(double time,
+ uint32_t* out,
+ const uint32_t* in1,
+ const uint32_t* in2,
+ const uint32_t* in3) {
+ (void)in1; // unused
+ (void)in2; // unused
+ (void)in3; // unused
+ update(time, out);
+ }
};
class filter : public fx
@@ -179,6 +192,18 @@ namespace frei0r
public:
virtual unsigned int effect_type(){ return F0R_PLUGIN_TYPE_FILTER; }
+ virtual void update(double time, uint32_t* out, const uint32_t* in1) = 0;
+
+ private:
+ virtual void update(double time,
+ uint32_t* out,
+ const uint32_t* in1,
+ const uint32_t* in2,
+ const uint32_t* in3) {
+ (void)in2; // unused
+ (void)in3; // unused
+ update(time, out, in1);
+ }
};
class mixer2 : public fx
@@ -188,6 +213,17 @@ namespace frei0r
public:
virtual unsigned int effect_type(){ return F0R_PLUGIN_TYPE_MIXER2; }
+ virtual void update(double time, uint32_t* out, const uint32_t* in1, const uint32_t* in2) = 0;
+
+ private:
+ virtual void update(double time,
+ uint32_t* out,
+ const uint32_t* in1,
+ const uint32_t* in2,
+ const uint32_t* in3) {
+ (void)in3; // unused
+ update(time, out, in1, in2);
+ }
};
diff --git a/src/filter/baltan/baltan.cpp b/src/filter/baltan/baltan.cpp
index 5f6e658..0442080 100644
--- a/src/filter/baltan/baltan.cpp
+++ b/src/filter/baltan/baltan.cpp
@@ -51,9 +51,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ const uint32_t* in);
private:
ScreenGeometry geo;
@@ -90,9 +88,7 @@ Baltan::~Baltan() {
void Baltan::update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
int i, cf;
uint32_t *src = (uint32_t*)in;
diff --git a/src/filter/bluescreen0r/bluescreen0r.cpp b/src/filter/bluescreen0r/bluescreen0r.cpp
index 5a022d4..b7e611e 100644
--- a/src/filter/bluescreen0r/bluescreen0r.cpp
+++ b/src/filter/bluescreen0r/bluescreen0r.cpp
@@ -64,11 +64,9 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
const uint32_t* pixel =in;
- uint32_t* outpixel= out;
+ uint32_t* outpixel= out;
uint32_t distInt = (uint32_t) (dist*dist*195075);
uint32_t distInt2 = distInt/2;
diff --git a/src/filter/cartoon/cartoon.cpp b/src/filter/cartoon/cartoon.cpp
index 56fde55..413b43f 100644
--- a/src/filter/cartoon/cartoon.cpp
+++ b/src/filter/cartoon/cartoon.cpp
@@ -95,9 +95,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
// Cartoonify picture, do a form of edge detect
int x, y, t;
diff --git a/src/filter/d90stairsteppingfix/d90stairsteppingfix.cpp b/src/filter/d90stairsteppingfix/d90stairsteppingfix.cpp
index ce8f716..4b0a2d0 100644
--- a/src/filter/d90stairsteppingfix/d90stairsteppingfix.cpp
+++ b/src/filter/d90stairsteppingfix/d90stairsteppingfix.cpp
@@ -196,10 +196,8 @@ public:
}
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ uint32_t* out,
+ const uint32_t* in)
{
if (height == 720) {
diff --git a/src/filter/delay0r/delay0r.cpp b/src/filter/delay0r/delay0r.cpp
index 21a0124..7dd7217 100644
--- a/src/filter/delay0r/delay0r.cpp
+++ b/src/filter/delay0r/delay0r.cpp
@@ -25,9 +25,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
unsigned int* reusable = 0;
// remove old frames
diff --git a/src/filter/delaygrab/delaygrab.cpp b/src/filter/delaygrab/delaygrab.cpp
index 0ab0e94..fa24126 100644
--- a/src/filter/delaygrab/delaygrab.cpp
+++ b/src/filter/delaygrab/delaygrab.cpp
@@ -61,9 +61,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ const uint32_t* in);
private:
@@ -141,9 +139,7 @@ DelayGrab::~DelayGrab() {
void DelayGrab::update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
/* Update queue pointer */
if (curqueuenum==0) {
diff --git a/src/filter/edgeglow/edgeglow.cpp b/src/filter/edgeglow/edgeglow.cpp
index 0375925..d36db5a 100644
--- a/src/filter/edgeglow/edgeglow.cpp
+++ b/src/filter/edgeglow/edgeglow.cpp
@@ -42,9 +42,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
std::copy(in, in + width*height, out);
for (unsigned int y=1; y<height-1; ++y)
diff --git a/src/filter/equaliz0r/equaliz0r.cpp b/src/filter/equaliz0r/equaliz0r.cpp
index d651e9e..bafd040 100644
--- a/src/filter/equaliz0r/equaliz0r.cpp
+++ b/src/filter/equaliz0r/equaliz0r.cpp
@@ -90,9 +90,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
std::copy(in, in + width*height, out);
updateLookUpTables(in);
diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp
index c688884..6d6e8f2 100644
--- a/src/filter/facebl0r/facebl0r.cpp
+++ b/src/filter/facebl0r/facebl0r.cpp
@@ -43,9 +43,7 @@ public:
void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ const uint32_t* in);
private:
@@ -134,9 +132,7 @@ FaceBl0r::~FaceBl0r() {
void FaceBl0r::update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
if (!cascade) {
cvSetNumThreads(cvRound(threads * 100));
diff --git a/src/filter/facedetect/facedetect.cpp b/src/filter/facedetect/facedetect.cpp
index dbcae75..eaa62fe 100644
--- a/src/filter/facedetect/facedetect.cpp
+++ b/src/filter/facedetect/facedetect.cpp
@@ -122,9 +122,7 @@ public:
void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
if (!cascade) {
cvSetNumThreads(cvRound(threads * 100));
diff --git a/src/filter/lightgraffiti/lightgraffiti.cpp b/src/filter/lightgraffiti/lightgraffiti.cpp
index 865dbd3..96ccd30 100644
--- a/src/filter/lightgraffiti/lightgraffiti.cpp
+++ b/src/filter/lightgraffiti/lightgraffiti.cpp
@@ -202,10 +202,8 @@ public:
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ uint32_t* out,
+ const uint32_t* in)
{
double sensitivity = m_pSensitivity * 5;
double thresholdBrightness = m_pThresholdBrightness * 765;
diff --git a/src/filter/ndvi/ndvi.cpp b/src/filter/ndvi/ndvi.cpp
index 8c35cef..f9d65bd 100644
--- a/src/filter/ndvi/ndvi.cpp
+++ b/src/filter/ndvi/ndvi.cpp
@@ -50,10 +50,8 @@ class Ndvi : public frei0r::filter
public:
Ndvi(unsigned int width, unsigned int height);
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ uint32_t* out,
+ const uint32_t* in);
private:
void initLut();
@@ -118,9 +116,7 @@ Ndvi::Ndvi(unsigned int width, unsigned int height)
void Ndvi::update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
uint8_t *inP = (uint8_t*)in;
uint8_t *outP = (uint8_t*)out;
double visScale = paramVisScale * 10.0;
diff --git a/src/filter/nervous/nervous.cpp b/src/filter/nervous/nervous.cpp
index 293450f..16dc74d 100644
--- a/src/filter/nervous/nervous.cpp
+++ b/src/filter/nervous/nervous.cpp
@@ -59,9 +59,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ const uint32_t* in);
private:
@@ -117,9 +115,7 @@ void Nervous::_init(int wdt, int hgt) {
void Nervous::update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
memcpy(planetable[plane],in,geo.size);
if(stock<PLANES) stock++;
diff --git a/src/filter/nosync0r/nosync0r.cpp b/src/filter/nosync0r/nosync0r.cpp
index bf0fdc7..807e6fc 100644
--- a/src/filter/nosync0r/nosync0r.cpp
+++ b/src/filter/nosync0r/nosync0r.cpp
@@ -14,9 +14,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
unsigned int
first_line=static_cast<unsigned int>(height*std::fmod(hsync,1.0));
diff --git a/src/filter/primaries/primaries.cpp b/src/filter/primaries/primaries.cpp
index 93a2e28..e133875 100644
--- a/src/filter/primaries/primaries.cpp
+++ b/src/filter/primaries/primaries.cpp
@@ -45,9 +45,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
unsigned char mean = 0;
int f = factor+1; // f = [2,inf)
diff --git a/src/filter/scanline0r/scanline0r.cpp b/src/filter/scanline0r/scanline0r.cpp
index fee8d64..6ecf946 100644
--- a/src/filter/scanline0r/scanline0r.cpp
+++ b/src/filter/scanline0r/scanline0r.cpp
@@ -12,9 +12,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
for (unsigned int line=0; line < height; line+=4)
{
diff --git a/src/filter/sobel/sobel.cpp b/src/filter/sobel/sobel.cpp
index b13a7e0..95a1c72 100644
--- a/src/filter/sobel/sobel.cpp
+++ b/src/filter/sobel/sobel.cpp
@@ -30,9 +30,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
std::copy(in, in + width*height, out);
for (unsigned int y=1; y<height-1; ++y)
diff --git a/src/filter/sopsat/sopsat.cpp b/src/filter/sopsat/sopsat.cpp
index 8ba0940..271845c 100644
--- a/src/filter/sopsat/sopsat.cpp
+++ b/src/filter/sopsat/sopsat.cpp
@@ -130,9 +130,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
// Rebuild the lookup table in case the prarameters have changed.
updateLUT();
diff --git a/src/filter/threelay0r/threelay0r.cpp b/src/filter/threelay0r/threelay0r.cpp
index 49a99e0..c726090 100644
--- a/src/filter/threelay0r/threelay0r.cpp
+++ b/src/filter/threelay0r/threelay0r.cpp
@@ -53,9 +53,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+ const uint32_t* in) {
histogram h;
// create histogramm
diff --git a/src/filter/timeout/timeout.cpp b/src/filter/timeout/timeout.cpp
index 4810f6c..df1a8be 100644
--- a/src/filter/timeout/timeout.cpp
+++ b/src/filter/timeout/timeout.cpp
@@ -77,9 +77,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
std::copy(in, in + width*height, out);
diff --git a/src/filter/tutorial/tutorial.cpp b/src/filter/tutorial/tutorial.cpp
index 8c292dd..3ef5d62 100644
--- a/src/filter/tutorial/tutorial.cpp
+++ b/src/filter/tutorial/tutorial.cpp
@@ -105,9 +105,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
// Just copy input to output.
// This is useful if ony few changes are made to the output.
diff --git a/src/filter/twolay0r/twolay0r.cpp b/src/filter/twolay0r/twolay0r.cpp
index 3ad713e..cdaad64 100644
--- a/src/filter/twolay0r/twolay0r.cpp
+++ b/src/filter/twolay0r/twolay0r.cpp
@@ -39,9 +39,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
histogram h;
diff --git a/src/filter/vignette/vignette.cpp b/src/filter/vignette/vignette.cpp
index 28f97f8..8debb65 100644
--- a/src/filter/vignette/vignette.cpp
+++ b/src/filter/vignette/vignette.cpp
@@ -71,9 +71,7 @@ public:
virtual void update(double time,
uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in)
{
std::copy(in, in + m_width*m_height, out);
diff --git a/src/generator/dem0scene/plasma.cpp b/src/generator/dem0scene/plasma.cpp
index 6ce8f46..7a44d2a 100644
--- a/src/generator/dem0scene/plasma.cpp
+++ b/src/generator/dem0scene/plasma.cpp
@@ -52,11 +52,7 @@ public:
Plasma(int wdt, int hgt);
~Plasma();
- virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3);
+ virtual void update(double time, uint32_t* out);
private:
@@ -163,11 +159,7 @@ Plasma::~Plasma() {
}
-void Plasma::update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3) {
+void Plasma::update(double time, uint32_t* out) {
uint16_t i, j;
uint8_t index;
int x;
diff --git a/src/generator/lissajous0r/lissajous0r.cpp b/src/generator/lissajous0r/lissajous0r.cpp
index 3354bd9..80541bc 100644
--- a/src/generator/lissajous0r/lissajous0r.cpp
+++ b/src/generator/lissajous0r/lissajous0r.cpp
@@ -41,10 +41,7 @@ public:
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ uint32_t* out)
{
std::fill(out, out+width*height, 0x00000000);
diff --git a/src/generator/nois0r/nois0r.cpp b/src/generator/nois0r/nois0r.cpp
index 2740de6..b8f5841 100644
--- a/src/generator/nois0r/nois0r.cpp
+++ b/src/generator/nois0r/nois0r.cpp
@@ -48,10 +48,7 @@ public:
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ uint32_t* out)
{
wnoise wn(0x0f0f0f0f ^ (unsigned int)(time*100000.0));
diff --git a/src/generator/onecol0r/onecol0r.cpp b/src/generator/onecol0r/onecol0r.cpp
index fd86846..22dd921 100644
--- a/src/generator/onecol0r/onecol0r.cpp
+++ b/src/generator/onecol0r/onecol0r.cpp
@@ -32,10 +32,7 @@ public:
}
virtual void update(double time,
- uint32_t* out,
- const uint32_t* in,
- const uint32_t* in2,
- const uint32_t* in3)
+ uint32_t* out)
{
unsigned int col;
unsigned char* c = reinterpret_cast<unsigned char*>(&col);
diff --git a/src/generator/partik0l/partik0l.cpp b/src/generator/partik0l/partik0l.cpp
index 4a44591..40c3674 100644
--- a/src/generator/partik0l/partik0l.cpp
+++ b/src/generator/partik0l/partik0l.cpp
@@ -53,10 +53,7 @@ public:
~Partik0l();
void update(double time,
- uint32_t* out,
- const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3);
+ uint32_t* out);
int w, h;
@@ -161,10 +158,7 @@ Partik0l::~Partik0l() {
void Partik0l::update(double time,
- uint32_t* out,
- const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3) {
+ uint32_t* out) {
/* automatic random recalculation:
if( !blossom_count ) {
recalculate();
diff --git a/src/mixer2/addition/addition.cpp b/src/mixer2/addition/addition.cpp
index 62a24b1..650f8f5 100644
--- a/src/mixer2/addition/addition.cpp
+++ b/src/mixer2/addition/addition.cpp
@@ -45,8 +45,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *A = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *B = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/addition_alpha/addition_alpha.cpp b/src/mixer2/addition_alpha/addition_alpha.cpp
index 20e1fe2..92b5f2c 100644
--- a/src/mixer2/addition_alpha/addition_alpha.cpp
+++ b/src/mixer2/addition_alpha/addition_alpha.cpp
@@ -49,8 +49,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *A = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *B = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/alphaatop/alphaatop.cpp b/src/mixer2/alphaatop/alphaatop.cpp
index 81e5958..680e4b9 100644
--- a/src/mixer2/alphaatop/alphaatop.cpp
+++ b/src/mixer2/alphaatop/alphaatop.cpp
@@ -32,8 +32,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
uint8_t *dst = reinterpret_cast<uint8_t*>(out);
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
diff --git a/src/mixer2/alphain/alphain.cpp b/src/mixer2/alphain/alphain.cpp
index 55f6a08..f921cae 100644
--- a/src/mixer2/alphain/alphain.cpp
+++ b/src/mixer2/alphain/alphain.cpp
@@ -32,8 +32,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
uint8_t *dst = reinterpret_cast<uint8_t*>(out);
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
diff --git a/src/mixer2/alphaout/alphaout.cpp b/src/mixer2/alphaout/alphaout.cpp
index a95cfbf..bfc0b02 100644
--- a/src/mixer2/alphaout/alphaout.cpp
+++ b/src/mixer2/alphaout/alphaout.cpp
@@ -32,8 +32,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
uint8_t *dst = reinterpret_cast<uint8_t*>(out);
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
diff --git a/src/mixer2/alphaover/alphaover.cpp b/src/mixer2/alphaover/alphaover.cpp
index 885cff7..d1181b8 100644
--- a/src/mixer2/alphaover/alphaover.cpp
+++ b/src/mixer2/alphaover/alphaover.cpp
@@ -32,8 +32,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
uint8_t *dst = reinterpret_cast<uint8_t*>(out);
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
diff --git a/src/mixer2/alphaxor/alphaxor.cpp b/src/mixer2/alphaxor/alphaxor.cpp
index 7f2073c..05edb7b 100644
--- a/src/mixer2/alphaxor/alphaxor.cpp
+++ b/src/mixer2/alphaxor/alphaxor.cpp
@@ -32,8 +32,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
uint8_t *dst = reinterpret_cast<uint8_t*>(out);
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
diff --git a/src/mixer2/blend/blend.cpp b/src/mixer2/blend/blend.cpp
index f82c89e..093a894 100644
--- a/src/mixer2/blend/blend.cpp
+++ b/src/mixer2/blend/blend.cpp
@@ -42,8 +42,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/burn/burn.cpp b/src/mixer2/burn/burn.cpp
index 10577bb..c611e30 100644
--- a/src/mixer2/burn/burn.cpp
+++ b/src/mixer2/burn/burn.cpp
@@ -42,8 +42,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/color_only/color_only.cpp b/src/mixer2/color_only/color_only.cpp
index d256819..10a9d8b 100644
--- a/src/mixer2/color_only/color_only.cpp
+++ b/src/mixer2/color_only/color_only.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/darken/darken.cpp b/src/mixer2/darken/darken.cpp
index b189f5c..002aeab 100644
--- a/src/mixer2/darken/darken.cpp
+++ b/src/mixer2/darken/darken.cpp
@@ -44,8 +44,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/difference/difference.cpp b/src/mixer2/difference/difference.cpp
index 98d1e0e..9a6cb97 100644
--- a/src/mixer2/difference/difference.cpp
+++ b/src/mixer2/difference/difference.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/divide/divide.cpp b/src/mixer2/divide/divide.cpp
index 6719168..da9ec1c 100644
--- a/src/mixer2/divide/divide.cpp
+++ b/src/mixer2/divide/divide.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/dodge/dodge.cpp b/src/mixer2/dodge/dodge.cpp
index 46a450c..fe234bd 100644
--- a/src/mixer2/dodge/dodge.cpp
+++ b/src/mixer2/dodge/dodge.cpp
@@ -42,8 +42,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/grain_extract/grain_extract.cpp b/src/mixer2/grain_extract/grain_extract.cpp
index f7be1e8..5e5e519 100644
--- a/src/mixer2/grain_extract/grain_extract.cpp
+++ b/src/mixer2/grain_extract/grain_extract.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/grain_merge/grain_merge.cpp b/src/mixer2/grain_merge/grain_merge.cpp
index e463729..6f88e95 100644
--- a/src/mixer2/grain_merge/grain_merge.cpp
+++ b/src/mixer2/grain_merge/grain_merge.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/hardlight/hardlight.cpp b/src/mixer2/hardlight/hardlight.cpp
index 0c9410b..07d55dd 100644
--- a/src/mixer2/hardlight/hardlight.cpp
+++ b/src/mixer2/hardlight/hardlight.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/hue/hue.cpp b/src/mixer2/hue/hue.cpp
index 9317b6e..3304af4 100644
--- a/src/mixer2/hue/hue.cpp
+++ b/src/mixer2/hue/hue.cpp
@@ -39,8 +39,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/lighten/lighten.cpp b/src/mixer2/lighten/lighten.cpp
index 57cdc0c..76922b9 100644
--- a/src/mixer2/lighten/lighten.cpp
+++ b/src/mixer2/lighten/lighten.cpp
@@ -44,8 +44,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/multiply/multiply.cpp b/src/mixer2/multiply/multiply.cpp
index bd73363..41de211 100644
--- a/src/mixer2/multiply/multiply.cpp
+++ b/src/mixer2/multiply/multiply.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/overlay/overlay.cpp b/src/mixer2/overlay/overlay.cpp
index 2f81247..e252fcf 100644
--- a/src/mixer2/overlay/overlay.cpp
+++ b/src/mixer2/overlay/overlay.cpp
@@ -42,8 +42,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/saturation/saturation.cpp b/src/mixer2/saturation/saturation.cpp
index 041917a..4e8aeb9 100644
--- a/src/mixer2/saturation/saturation.cpp
+++ b/src/mixer2/saturation/saturation.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/screen/screen.cpp b/src/mixer2/screen/screen.cpp
index c8980cf..78e2f53 100644
--- a/src/mixer2/screen/screen.cpp
+++ b/src/mixer2/screen/screen.cpp
@@ -42,8 +42,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/softlight/softlight.cpp b/src/mixer2/softlight/softlight.cpp
index 764e795..98aef94 100644
--- a/src/mixer2/softlight/softlight.cpp
+++ b/src/mixer2/softlight/softlight.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/subtract/subtract.cpp b/src/mixer2/subtract/subtract.cpp
index 9d7cd1a..93c509e 100644
--- a/src/mixer2/subtract/subtract.cpp
+++ b/src/mixer2/subtract/subtract.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/value/value.cpp b/src/mixer2/value/value.cpp
index 0f85cbf..96a48cb 100644
--- a/src/mixer2/value/value.cpp
+++ b/src/mixer2/value/value.cpp
@@ -40,8 +40,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
const uint8_t *src1 = reinterpret_cast<const uint8_t*>(in1);
const uint8_t *src2 = reinterpret_cast<const uint8_t*>(in2);
diff --git a/src/mixer2/xfade0r/xfade0r.cpp b/src/mixer2/xfade0r/xfade0r.cpp
index d3379c3..2855de3 100644
--- a/src/mixer2/xfade0r/xfade0r.cpp
+++ b/src/mixer2/xfade0r/xfade0r.cpp
@@ -29,8 +29,7 @@ public:
void update(double time,
uint32_t* out,
const uint32_t* in1,
- const uint32_t* in2,
- const uint32_t* in3)
+ const uint32_t* in2)
{
std::transform(reinterpret_cast<const uint8_t*>(in1),
reinterpret_cast<const uint8_t*>(in1)+(width*height*4),