Adjust for Movit moving into namespace movit.

diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp
index cf71a211434073678a9135cc8e5721b903b0eeff..0a33bc9aed77341acb7f9c75999ad0d858cae3bf 100644 (file)
--- a/src/modules/opengl/filter_glsl_manager.cpp
+++ b/src/modules/opengl/filter_glsl_manager.cpp
@@ -42,6 +42,8 @@ extern "C" {
 #include <GL/glx.h>
 #endif
 
+using namespace movit;
+
 void dec_ref_and_delete(GlslManager *p)
 {
        if (p->dec_ref() == 0) {

diff --git a/src/modules/opengl/filter_glsl_manager.h b/src/modules/opengl/filter_glsl_manager.h
index 28810506b4b3fe9cbb893415b98862aeecda83c6..e867f26f7242e650ba474471482085f6d94e2d3b 100644 (file)
--- a/src/modules/opengl/filter_glsl_manager.h
+++ b/src/modules/opengl/filter_glsl_manager.h
@@ -56,21 +56,26 @@ struct glsl_pbo_s
 };
 typedef struct glsl_pbo_s *glsl_pbo;
 
+namespace movit {
+
 class Effect;
 class EffectChain;
-class MltInput;
 class ResourcePool;
 
+}  // namespace movit
+
+class MltInput;
+
 struct GlslChain
 {
-       EffectChain *effect_chain;
+       movit::EffectChain *effect_chain;
 
        // All MltInputs in the effect chain. These are not owned by the
        // EffectChain (although the contained Input* is).
        std::map<mlt_producer, MltInput*> inputs;
 
        // All services owned by the effect chain and their associated Movit effect.
-       std::map<mlt_service, Effect*> effects;
+       std::map<mlt_service, movit::Effect*> effects;
 
        // For each effect in the Movit graph, a unique identifier for the service
        // and whether it's disabled or not, using post-order traversal.
@@ -92,13 +97,13 @@ public:
        glsl_pbo get_pbo(int size);
        void cleanupContext();
 
-       ResourcePool* get_resource_pool() { return resource_pool; }
+       movit::ResourcePool* get_resource_pool() { return resource_pool; }
 
        static void set_chain(mlt_service, GlslChain*);
        static GlslChain* get_chain(mlt_service);
 
-       static Effect* get_effect(mlt_service, mlt_frame);
-       static Effect* set_effect(mlt_service, mlt_frame, Effect*);
+       static movit::Effect* get_effect(mlt_service, mlt_frame);
+       static movit::Effect* set_effect(mlt_service, mlt_frame, movit::Effect*);
        static MltInput* get_input(mlt_producer, mlt_frame);
        static MltInput* set_input(mlt_producer, mlt_frame, MltInput*);
        static uint8_t* get_input_pixel_pointer(mlt_producer, mlt_frame);
@@ -109,8 +114,8 @@ public:
        static void get_effect_secondary_input(mlt_service, mlt_frame, mlt_service*, mlt_frame*);
        static void set_effect_secondary_input(mlt_service, mlt_frame, mlt_service, mlt_frame);
 
-       int render_frame_texture(EffectChain*, mlt_frame, int width, int height, uint8_t **image);
-       int render_frame_rgba(EffectChain*, mlt_frame, int width, int height, uint8_t **image);
+       int render_frame_texture(movit::EffectChain*, mlt_frame, int width, int height, uint8_t **image);
+       int render_frame_rgba(movit::EffectChain*, mlt_frame, int width, int height, uint8_t **image);
        static void lock_service(mlt_frame frame);
        static void unlock_service(mlt_frame frame);
 
@@ -122,7 +127,7 @@ private:
        static void onClose( mlt_properties owner, GlslManager* filter );
        static void onServiceChanged( mlt_properties owner, mlt_service service );
        static void onPropertyChanged( mlt_properties owner, mlt_service service, const char* property );
-       ResourcePool* resource_pool;
+       movit::ResourcePool* resource_pool;
        Mlt::Deque texture_list;
        Mlt::Deque syncs_to_delete;
        glsl_pbo  pbo;

diff --git a/src/modules/opengl/filter_movit_blur.cpp b/src/modules/opengl/filter_movit_blur.cpp
index e89a09daf61cb39dff799105704beacacd798ff7..62f9542fe7a2e48feffb6b0c0299abc2ca2cb3f8 100644 (file)
--- a/src/modules/opengl/filter_movit_blur.cpp
+++ b/src/modules/opengl/filter_movit_blur.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/blur_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_convert.cpp b/src/modules/opengl/filter_movit_convert.cpp
index 764374379fa07e9ac9917e1ebdc8c5bc41e3bf3f..5d40f34bc14e0cc05a6b7827e83a8475d0f9471e 100644 (file)
--- a/src/modules/opengl/filter_movit_convert.cpp
+++ b/src/modules/opengl/filter_movit_convert.cpp
@@ -30,6 +30,8 @@
 #include <mlt++/MltProducer.h>
 #include "mlt_flip_effect.h"
 
+using namespace movit;
+
 static void set_movit_parameters( GlslChain *chain, mlt_service service, mlt_frame frame );
 
 static void yuv422_to_yuv422p( uint8_t *yuv422, uint8_t *yuv422p, int width, int height )

diff --git a/src/modules/opengl/filter_movit_crop.cpp b/src/modules/opengl/filter_movit_crop.cpp
index 120bbca9d79c67de4ed401fa3ec510999dd65376..24ae8702d298bc2e8d1c34b0b952a914326aba69 100644 (file)
--- a/src/modules/opengl/filter_movit_crop.cpp
+++ b/src/modules/opengl/filter_movit_crop.cpp
@@ -25,6 +25,8 @@
 #include <movit/padding_effect.h>
 #include "optional_effect.h"
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        int error = 0;

diff --git a/src/modules/opengl/filter_movit_deconvolution_sharpen.cpp b/src/modules/opengl/filter_movit_deconvolution_sharpen.cpp
index 20edea67bc4c0da86d932eed03d824bd02296d25..f8060184f50fb3c0b0c2c8e080b5c506ffdb9cdc 100644 (file)
--- a/src/modules/opengl/filter_movit_deconvolution_sharpen.cpp
+++ b/src/modules/opengl/filter_movit_deconvolution_sharpen.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/deconvolution_sharpen_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_diffusion.cpp b/src/modules/opengl/filter_movit_diffusion.cpp
index 0ffdf7bb555867030be71c8eb2a63db58e77f9ee..dcd7fa675647a48cbc897e33f7c48df1a1df79ec 100644 (file)
--- a/src/modules/opengl/filter_movit_diffusion.cpp
+++ b/src/modules/opengl/filter_movit_diffusion.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/diffusion_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_glow.cpp b/src/modules/opengl/filter_movit_glow.cpp
index 3d5f198f30ba1231a1e7ced6fed056cb472c9119..d1a5bb5d34a24b876777a9b59862c76447eae3be 100644 (file)
--- a/src/modules/opengl/filter_movit_glow.cpp
+++ b/src/modules/opengl/filter_movit_glow.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/glow_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_lift_gamma_gain.cpp b/src/modules/opengl/filter_movit_lift_gamma_gain.cpp
index a45d87b314b7ae355e135fdcaba76bafdb226595..dcabeb59667e0015e07cdd6c62f05dafe32d4deb 100644 (file)
--- a/src/modules/opengl/filter_movit_lift_gamma_gain.cpp
+++ b/src/modules/opengl/filter_movit_lift_gamma_gain.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/lift_gamma_gain_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_mirror.cpp b/src/modules/opengl/filter_movit_mirror.cpp
index 6c7b61328358f1909b579dd92279ff8894834a53..03206b210abe9494a5dd852016e13d9c0908b373 100644 (file)
--- a/src/modules/opengl/filter_movit_mirror.cpp
+++ b/src/modules/opengl/filter_movit_mirror.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/mirror_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_opacity.cpp b/src/modules/opengl/filter_movit_opacity.cpp
index 3cdb8ab3bd1c420dd779a96735aa5ddee7a402b1..300145c2b731a52897ae1c0e6b30a578295db730 100644 (file)
--- a/src/modules/opengl/filter_movit_opacity.cpp
+++ b/src/modules/opengl/filter_movit_opacity.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/multiply_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_rect.cpp b/src/modules/opengl/filter_movit_rect.cpp
index 110fd8f0228a7a98708f19b40cc9afccba0da6a5..f09a77e1349fd47486466bc5c3bd67a48503c5aa 100644 (file)
--- a/src/modules/opengl/filter_movit_rect.cpp
+++ b/src/modules/opengl/filter_movit_rect.cpp
@@ -20,6 +20,8 @@
 #include <framework/mlt.h>
 #include "filter_glsl_manager.h"
 
+using namespace movit;
+
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
        // Drive the resize and resample filters on the b_frame for these composite parameters

diff --git a/src/modules/opengl/filter_movit_resample.cpp b/src/modules/opengl/filter_movit_resample.cpp
index 74dd55a9eb2167955cb46daafd2b791860192313..16aec9e89d56c4af3c2b6ea0801909f9a3320bc0 100644 (file)
--- a/src/modules/opengl/filter_movit_resample.cpp
+++ b/src/modules/opengl/filter_movit_resample.cpp
@@ -25,6 +25,8 @@
 #include <movit/resample_effect.h>
 #include "optional_effect.h"
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_properties properties = MLT_FRAME_PROPERTIES( frame );

diff --git a/src/modules/opengl/filter_movit_resize.cpp b/src/modules/opengl/filter_movit_resize.cpp
index c5f2835f16c0a9c0ad50e0147dba6983a5956db6..32f47c2a59af24a94626411d15b5ffbbf722dd27 100644 (file)
--- a/src/modules/opengl/filter_movit_resize.cpp
+++ b/src/modules/opengl/filter_movit_resize.cpp
@@ -28,6 +28,8 @@
 #include <movit/padding_effect.h>
 #include "optional_effect.h"
 
+using namespace movit;
+
 static float alignment_parse( char* align )
 {
        int ret = 0.0f;

diff --git a/src/modules/opengl/filter_movit_saturation.cpp b/src/modules/opengl/filter_movit_saturation.cpp
index fa8a7e7d5c83ed7de1f017e9eb9484ee8214929c..90eff2bb1713983bfeacd8d0696a72fa82894121 100644 (file)
--- a/src/modules/opengl/filter_movit_saturation.cpp
+++ b/src/modules/opengl/filter_movit_saturation.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/saturation_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_vignette.cpp b/src/modules/opengl/filter_movit_vignette.cpp
index f4ff63d9f01747d40823d6ac817ee0ecda0a5825..8cabee58f343675ad558ddc84e2547fd61d78a85 100644 (file)
--- a/src/modules/opengl/filter_movit_vignette.cpp
+++ b/src/modules/opengl/filter_movit_vignette.cpp
@@ -24,6 +24,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/vignette_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );

diff --git a/src/modules/opengl/filter_movit_white_balance.cpp b/src/modules/opengl/filter_movit_white_balance.cpp
index d2301ee71ca6d5d43d94f5113e9a3c6792139439..f9d7e5a5e3620b43c9cc0546031dfb8e47dae2bf 100644 (file)
--- a/src/modules/opengl/filter_movit_white_balance.cpp
+++ b/src/modules/opengl/filter_movit_white_balance.cpp
@@ -25,6 +25,8 @@
 #include "filter_glsl_manager.h"
 #include <movit/white_balance_effect.h>
 
+using namespace movit;
+
 static double srgb8_to_linear(int c)
 {
        double x = c / 255.0f;

diff --git a/src/modules/opengl/mlt_flip_effect.h b/src/modules/opengl/mlt_flip_effect.h
index 3fa9b72e877e6ee47cdbba24cf9ebd809abf58b7..98a79c000be768ddfeead8b5787e5bfaa739baee 100644 (file)
--- a/src/modules/opengl/mlt_flip_effect.h
+++ b/src/modules/opengl/mlt_flip_effect.h
@@ -23,7 +23,7 @@
 namespace Mlt
 {
 
-class VerticalFlip : public Effect {
+class VerticalFlip : public movit::Effect {
 public:
        VerticalFlip() {}
        virtual std::string effect_type_id() const { return "MltVerticalFlip"; }

diff --git a/src/modules/opengl/mlt_movit_input.cpp b/src/modules/opengl/mlt_movit_input.cpp
index 11f44bf37cdd3bd26f240f23eec07253d9b40afe..89a2d84dbe5c65944c8180a6774c92c89ea775f8 100644 (file)
--- a/src/modules/opengl/mlt_movit_input.cpp
+++ b/src/modules/opengl/mlt_movit_input.cpp
@@ -19,6 +19,8 @@
 
 #include "mlt_movit_input.h"
 
+using namespace movit;
+
 MltInput::MltInput()
        : input(0)
        , isRGB(true)

diff --git a/src/modules/opengl/mlt_movit_input.h b/src/modules/opengl/mlt_movit_input.h
index df8b36ec6ade61b024e535a5e573d0f3ff864068..c200cc67f6c2e0536cb33ffb5979c93eee125307 100644 (file)
--- a/src/modules/opengl/mlt_movit_input.h
+++ b/src/modules/opengl/mlt_movit_input.h
@@ -30,18 +30,18 @@ public:
        MltInput();
        ~MltInput();
 
-       void useFlatInput(MovitPixelFormat pix_fmt, unsigned width, unsigned height);
-       void useYCbCrInput(const ImageFormat& image_format, const YCbCrFormat& ycbcr_format, unsigned width, unsigned height);
+       void useFlatInput(movit::MovitPixelFormat pix_fmt, unsigned width, unsigned height);
+       void useYCbCrInput(const movit::ImageFormat& image_format, const movit::YCbCrFormat& ycbcr_format, unsigned width, unsigned height);
        void set_pixel_data(const unsigned char* data);
        void invalidate_pixel_data();
-       Input *get_input() { return input; }
+       movit::Input *get_input() { return input; }
 
 private:
        unsigned m_width, m_height;
        // Note: Owned by the EffectChain, so should not be deleted by us.
-       Input *input;
+       movit::Input *input;
        bool isRGB;
-       YCbCrFormat m_ycbcr_format;
+       movit::YCbCrFormat m_ycbcr_format;
 };
 
 #endif // MLT_MOVIT_INPUT_H

diff --git a/src/modules/opengl/optional_effect.h b/src/modules/opengl/optional_effect.h
index ec6ea27ab11b98e9740d209e4c8db71386c5c2ce..2cb13915ff70780fdd92bcd82f1acdc79564d1bd 100644 (file)
--- a/src/modules/opengl/optional_effect.h
+++ b/src/modules/opengl/optional_effect.h
@@ -12,7 +12,7 @@ class OptionalEffect : public T {
 public:
        OptionalEffect() : disable(0) { this->register_int("disable", &disable); }
        virtual std::string effect_type_id() const { return "OptionalEffect[" + T::effect_type_id() + "]"; }
-       virtual void rewrite_graph(EffectChain *graph, Node *self) {
+       virtual void rewrite_graph(movit::EffectChain *graph, movit::Node *self) {
                if (disable) {
                        assert(self->incoming_links.size() == 1);
                        graph->replace_sender(self, self->incoming_links[0]);

diff --git a/src/modules/opengl/transition_movit_mix.cpp b/src/modules/opengl/transition_movit_mix.cpp
index 3e7ef964879c59faab70fb477508e4bd591428db..9a87f9c533e020adc10a16301f868fd590719647 100644 (file)
--- a/src/modules/opengl/transition_movit_mix.cpp
+++ b/src/modules/opengl/transition_movit_mix.cpp
@@ -30,6 +30,8 @@
 #include "mlt_movit_input.h"
 #include "mlt_flip_effect.h"
 
+using namespace movit;
+
 static int get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        int error;

diff --git a/src/modules/opengl/transition_movit_overlay.cpp b/src/modules/opengl/transition_movit_overlay.cpp
index 2b77c9c617f71ccf362c6caa8b84b68cb4e6fce7..c855c658269f6b85e24c92b054f717016db69c01 100644 (file)
--- a/src/modules/opengl/transition_movit_overlay.cpp
+++ b/src/modules/opengl/transition_movit_overlay.cpp
@@ -28,6 +28,8 @@
 #include <movit/util.h>
 #include <movit/overlay_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        int error;