Check for __APPLE__ instead of __DARWIN__.

[movit] / input.h

diff --git a/input.h b/input.h
index db1eae9b7b3fbaf681efc68cac3e8c93731edaf2..7652e1793a4599d01fb726bfbf939741ac01d2aa 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,15 +1,15 @@
-#ifndef _INPUT_H
-#define _INPUT_H 1
+#ifndef _MOVIT_INPUT_H
+#define _MOVIT_INPUT_H 1
 
 #include <assert.h>
 
 #include "effect.h"
 #include "image_format.h"
 
+namespace movit {
+
 // An input is a degenerate case of an effect; it represents the picture data
-// that comes from the user. As such, it has zero “inputs” itself. Also, it
-// has an extra operation called finalize(), which runs when the effect chain
-// is finalized.
+// that comes from the user. As such, it has zero “inputs” itself.
 //
 // An input is, like any other effect, required to be able to output a GLSL
 // fragment giving a RGBA value (although that GLSL fragment will have zero
@@ -19,11 +19,6 @@ class Input : public Effect {
 public:
        virtual unsigned num_inputs() const { return 0; }
 
-       // Create the texture itself. We cannot do this in the constructor,
-       // because we don't necessarily know all the settings (sRGB texture,
-       // mipmap generation) at that point.
-       virtual void finalize() = 0;
-
        // Whether this input can deliver linear gamma directly if it's
        // asked to. (If so, set the parameter “output_linear_gamma”
        // to activate it.)
@@ -35,4 +30,6 @@ public:
        virtual GammaCurve get_gamma_curve() const = 0;
 };
 
-#endif // !defined(_INPUT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_INPUT_H)