From 6a498987705f134bc11ed8d7fc066bbf393186fc Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 3 Jan 2014 02:30:47 +0100
Subject: [PATCH] Rename glsl_manager.h to filter_glsl_manager.h, to be
 consistent with the .cpp file.

---
 src/modules/opengl/filter_deconvolution_sharpen.cpp          | 2 +-
 src/modules/opengl/filter_glsl_manager.cpp                   | 2 +-
 src/modules/opengl/{glsl_manager.h => filter_glsl_manager.h} | 2 +-
 src/modules/opengl/filter_lift_gamma_gain.cpp                | 2 +-
 src/modules/opengl/filter_movit_blur.cpp                     | 2 +-
 src/modules/opengl/filter_movit_convert.cpp                  | 2 +-
 src/modules/opengl/filter_movit_crop.cpp                     | 2 +-
 src/modules/opengl/filter_movit_diffusion.cpp                | 2 +-
 src/modules/opengl/filter_movit_glow.cpp                     | 2 +-
 src/modules/opengl/filter_movit_mirror.cpp                   | 2 +-
 src/modules/opengl/filter_movit_opacity.cpp                  | 2 +-
 src/modules/opengl/filter_movit_rect.cpp                     | 2 +-
 src/modules/opengl/filter_movit_resample.cpp                 | 2 +-
 src/modules/opengl/filter_movit_resize.cpp                   | 2 +-
 src/modules/opengl/filter_movit_saturation.cpp               | 2 +-
 src/modules/opengl/filter_movit_vignette.cpp                 | 2 +-
 src/modules/opengl/filter_white_balance.cpp                  | 2 +-
 src/modules/opengl/transition_movit_mix.cpp                  | 2 +-
 src/modules/opengl/transition_movit_overlay.cpp              | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)
 rename src/modules/opengl/{glsl_manager.h => filter_glsl_manager.h} (99%)

diff --git a/src/modules/opengl/filter_deconvolution_sharpen.cpp b/src/modules/opengl/filter_deconvolution_sharpen.cpp
index f93a4674..716d0252 100644
--- a/src/modules/opengl/filter_deconvolution_sharpen.cpp
+++ b/src/modules/opengl/filter_deconvolution_sharpen.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/deconvolution_sharpen_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp
index f1dfaa6a..35c6074e 100644
--- a/src/modules/opengl/filter_glsl_manager.cpp
+++ b/src/modules/opengl/filter_glsl_manager.cpp
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string>
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/util.h>
 #include <movit/effect_chain.h>
diff --git a/src/modules/opengl/glsl_manager.h b/src/modules/opengl/filter_glsl_manager.h
similarity index 99%
rename from src/modules/opengl/glsl_manager.h
rename to src/modules/opengl/filter_glsl_manager.h
index 55445915..2c08f6e4 100644
--- a/src/modules/opengl/glsl_manager.h
+++ b/src/modules/opengl/filter_glsl_manager.h
@@ -1,5 +1,5 @@
 /*
- * glsl_manager.h
+ * filter_glsl_manager.h
  * Copyright (C) 2013 Dan Dennedy <dan@dennedy.org>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/modules/opengl/filter_lift_gamma_gain.cpp b/src/modules/opengl/filter_lift_gamma_gain.cpp
index 5bc3a6a2..7f1e0f68 100644
--- a/src/modules/opengl/filter_lift_gamma_gain.cpp
+++ b/src/modules/opengl/filter_lift_gamma_gain.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/lift_gamma_gain_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_blur.cpp b/src/modules/opengl/filter_movit_blur.cpp
index e41e8050..162db82a 100644
--- a/src/modules/opengl/filter_movit_blur.cpp
+++ b/src/modules/opengl/filter_movit_blur.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/blur_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_convert.cpp b/src/modules/opengl/filter_movit_convert.cpp
index 124cb34f..aaf43c94 100644
--- a/src/modules/opengl/filter_movit_convert.cpp
+++ b/src/modules/opengl/filter_movit_convert.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/effect_chain.h>
 #include <movit/util.h>
 #include "mlt_movit_input.h"
diff --git a/src/modules/opengl/filter_movit_crop.cpp b/src/modules/opengl/filter_movit_crop.cpp
index 2927f6bd..1c346460 100644
--- a/src/modules/opengl/filter_movit_crop.cpp
+++ b/src/modules/opengl/filter_movit_crop.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/padding_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_diffusion.cpp b/src/modules/opengl/filter_movit_diffusion.cpp
index 7434937b..7c86b62f 100644
--- a/src/modules/opengl/filter_movit_diffusion.cpp
+++ b/src/modules/opengl/filter_movit_diffusion.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/diffusion_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_glow.cpp b/src/modules/opengl/filter_movit_glow.cpp
index b3333597..61d9289b 100644
--- a/src/modules/opengl/filter_movit_glow.cpp
+++ b/src/modules/opengl/filter_movit_glow.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/glow_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_mirror.cpp b/src/modules/opengl/filter_movit_mirror.cpp
index 8b6ab1fe..be71ca65 100644
--- a/src/modules/opengl/filter_movit_mirror.cpp
+++ b/src/modules/opengl/filter_movit_mirror.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/mirror_effect.h>
 
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
diff --git a/src/modules/opengl/filter_movit_opacity.cpp b/src/modules/opengl/filter_movit_opacity.cpp
index d0a81535..377eb773 100644
--- a/src/modules/opengl/filter_movit_opacity.cpp
+++ b/src/modules/opengl/filter_movit_opacity.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/mix_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_rect.cpp b/src/modules/opengl/filter_movit_rect.cpp
index a065e009..7f2386eb 100644
--- a/src/modules/opengl/filter_movit_rect.cpp
+++ b/src/modules/opengl/filter_movit_rect.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <framework/mlt.h>
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
diff --git a/src/modules/opengl/filter_movit_resample.cpp b/src/modules/opengl/filter_movit_resample.cpp
index 3375b286..adb60b07 100644
--- a/src/modules/opengl/filter_movit_resample.cpp
+++ b/src/modules/opengl/filter_movit_resample.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/resample_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_resize.cpp b/src/modules/opengl/filter_movit_resize.cpp
index 9756f37c..cc8f46cd 100644
--- a/src/modules/opengl/filter_movit_resize.cpp
+++ b/src/modules/opengl/filter_movit_resize.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/padding_effect.h>
 
diff --git a/src/modules/opengl/filter_movit_saturation.cpp b/src/modules/opengl/filter_movit_saturation.cpp
index 9e77c10e..3376b9fb 100644
--- a/src/modules/opengl/filter_movit_saturation.cpp
+++ b/src/modules/opengl/filter_movit_saturation.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/saturation_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_movit_vignette.cpp b/src/modules/opengl/filter_movit_vignette.cpp
index 7259d9bf..2fc35d4e 100644
--- a/src/modules/opengl/filter_movit_vignette.cpp
+++ b/src/modules/opengl/filter_movit_vignette.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/vignette_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
diff --git a/src/modules/opengl/filter_white_balance.cpp b/src/modules/opengl/filter_white_balance.cpp
index 5080bcf4..1c39969b 100644
--- a/src/modules/opengl/filter_white_balance.cpp
+++ b/src/modules/opengl/filter_white_balance.cpp
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/white_balance_effect.h>
 
 static double srgb8_to_linear(int c)
diff --git a/src/modules/opengl/transition_movit_mix.cpp b/src/modules/opengl/transition_movit_mix.cpp
index ec02752f..1697d12e 100644
--- a/src/modules/opengl/transition_movit_mix.cpp
+++ b/src/modules/opengl/transition_movit_mix.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/effect_chain.h>
 #include <movit/util.h>
diff --git a/src/modules/opengl/transition_movit_overlay.cpp b/src/modules/opengl/transition_movit_overlay.cpp
index 5273ab83..4492ce6b 100644
--- a/src/modules/opengl/transition_movit_overlay.cpp
+++ b/src/modules/opengl/transition_movit_overlay.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/effect_chain.h>
 #include <movit/util.h>
-- 
2.39.2