Check for __APPLE__ instead of __DARWIN__.

[movit] / diffusion_effect.cpp

diff --git a/diffusion_effect.cpp b/diffusion_effect.cpp
index a202f8c4d017c60828dccbf7624572f19a069a0d..afec9c80805490a97404d6e0c6e118759982dd9b 100644 (file)
--- a/diffusion_effect.cpp
+++ b/diffusion_effect.cpp
@@ -6,12 +6,24 @@
 #include "effect_chain.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 DiffusionEffect::DiffusionEffect()
        : blur(new BlurEffect),
-         overlay_matte(new OverlayMatteEffect)
+         overlay_matte(new OverlayMatteEffect),
+         owns_overlay_matte(true)
 {
 }
 
+DiffusionEffect::~DiffusionEffect()
+{
+       if (owns_overlay_matte) {
+               delete overlay_matte;
+       }
+}
+
 void DiffusionEffect::rewrite_graph(EffectChain *graph, Node *self)
 {
        assert(self->incoming_links.size() == 1);
@@ -19,6 +31,7 @@ void DiffusionEffect::rewrite_graph(EffectChain *graph, Node *self)
 
        Node *blur_node = graph->add_node(blur);
        Node *overlay_matte_node = graph->add_node(overlay_matte);
+       owns_overlay_matte = false;
        graph->replace_receiver(self, overlay_matte_node);
        graph->connect_nodes(input, blur_node);
        graph->connect_nodes(blur_node, overlay_matte_node);
@@ -27,7 +40,7 @@ void DiffusionEffect::rewrite_graph(EffectChain *graph, Node *self)
        self->disabled = true;
 }
 
-bool DiffusionEffect::set_float(const std::string &key, float value) {
+bool DiffusionEffect::set_float(const string &key, float value) {
        if (key == "blurred_mix_amount") {
                return overlay_matte->set_float(key, value);
        }
@@ -40,7 +53,9 @@ OverlayMatteEffect::OverlayMatteEffect()
        register_float("blurred_mix_amount", &blurred_mix_amount);
 }
 
-std::string OverlayMatteEffect::output_fragment_shader()
+string OverlayMatteEffect::output_fragment_shader()
 {
        return read_file("overlay_matte_effect.frag");
 }
+
+}  // namespace movit