Clean up effect enums a bit.

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 2bae9ed4e6f96b91567ecf6ac1c9d40497b75273..9246a4d94285749103011448f16b318743d71ed3 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -34,13 +34,13 @@ void EffectChain::add_output(const ImageFormat &format)
 Effect *instantiate_effect(EffectId effect)
 {
        switch (effect) {
 Effect *instantiate_effect(EffectId effect)
 {
        switch (effect) {

-       case GAMMA_CONVERSION:
+       case EFFECT_GAMMA_EXPANSION:

                return new GammaExpansionEffect();
                return new GammaExpansionEffect();

-       case RGB_PRIMARIES_CONVERSION:
-               return new GammaExpansionEffect();
-       case LIFT_GAMMA_GAIN:
+       case EFFECT_GAMMA_COMPRESSION:
+               return new GammaCompressionEffect();
+       case EFFECT_LIFT_GAMMA_GAIN:

                return new LiftGammaGainEffect();
                return new LiftGammaGainEffect();

-       case SATURATION:
+       case EFFECT_SATURATION:

                return new SaturationEffect();
        }
        assert(false);
                return new SaturationEffect();
        }
        assert(false);

diff --git a/effect_id.h b/effect_id.h
index 20cd3b9f5e2d129bb2e37028d98803e96a89ff87..97e0e1397e7fc29aabc2c78125c8e71321ce1898 100644 (file)
--- a/effect_id.h
+++ b/effect_id.h
@@ -3,12 +3,13 @@
 
 enum EffectId {
        // Mostly for internal use.
 
 enum EffectId {
        // Mostly for internal use.

-       GAMMA_CONVERSION = 0,
-       RGB_PRIMARIES_CONVERSION,
+       EFFECT_GAMMA_EXPANSION = 0,
+       EFFECT_GAMMA_COMPRESSION,
+       EFFECT_RGB_PRIMARIES_CONVERSION,

 
        // Color.
 
        // Color.

-       LIFT_GAMMA_GAIN,
-       SATURATION,
+       EFFECT_LIFT_GAMMA_GAIN,
+       EFFECT_SATURATION,

 };
 
 #endif // !defined(_EFFECT_ID_H)
 };
 
 #endif // !defined(_EFFECT_ID_H)

diff --git a/main.cpp b/main.cpp
index 333cdfc1cccb7d6d1f4c2ee0569e6164c0521ba5..cdf4f615f96c74b53e81cca02244527f23c9995f 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -183,8 +183,8 @@ int main(int argc, char **argv)
        inout_format.gamma_curve = GAMMA_sRGB;
 
        chain.add_input(inout_format);
        inout_format.gamma_curve = GAMMA_sRGB;
 
        chain.add_input(inout_format);

-       Effect *lift_gamma_gain_effect = chain.add_effect(LIFT_GAMMA_GAIN);
-       Effect *saturation_effect = chain.add_effect(SATURATION);
+       Effect *lift_gamma_gain_effect = chain.add_effect(EFFECT_LIFT_GAMMA_GAIN);
+       Effect *saturation_effect = chain.add_effect(EFFECT_SATURATION);

        chain.add_output(inout_format);
        chain.finalize();
 
        chain.add_output(inout_format);
        chain.finalize();