Move everything into “namespace movit”.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index d80c4f82a28b33c39c983b38f02894ad514979e1..9aa092ba207db4f614abfe5f45617c0eff3f3849 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <set>
 #include <stack>
+#include <utility>
 #include <vector>
 
 #include "alpha_division_effect.h"
@@ -28,6 +29,8 @@
 
 using namespace std;
 
+namespace movit {
+
 EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *resource_pool)
        : aspect_nom(aspect_nom),
          aspect_denom(aspect_denom),
@@ -1412,10 +1415,6 @@ void EffectChain::finalize()
 
        output_dot("step19-split-to-phases.dot");
 
-       for (unsigned i = 0; i < inputs.size(); ++i) {
-               inputs[i]->finalize();
-       }
-
        assert(phases[0]->inputs.empty());
        
        finalized = true;
@@ -1579,3 +1578,5 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                check_error();
        }
 }
+
+}  // namespace movit