Move slurping of files into its own function.

[movit] / main.cpp

diff --git a/main.cpp b/main.cpp
index 974fe53998c5ad5198919cd26acd67fdba8b58da..8c28c8f6cbde8716efc16fc25c3bdfda25387e20 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,14 @@
 #define HEIGHT 720
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
+#include <string.h>
 #include <math.h>
 #include <time.h>
+#include <assert.h>
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include <SDL/SDL.h>
 #include <SDL/SDL_opengl.h>
@@ -18,6 +21,8 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 
+#include "effect.h"
+#include "effect_chain.h"
 #include "util.h"
 #include "widgets.h"
 #include "texture_enum.h"
@@ -33,69 +38,13 @@ float lift_r = 0.0f, lift_g = 0.0f, lift_b = 0.0f;
 float gamma_r = 1.0f, gamma_g = 1.0f, gamma_b = 1.0f;
 float gain_r = 1.0f, gain_g = 1.0f, gain_b = 1.0f;
 
-struct ImageFormat {
-       enum { FORMAT_RGB, FORMAT_RGBA } format;
-
-       // Note: sRGB and 709 use the same colorspace primaries.
-       enum { COLORSPACE_sRGB, COLORSPACE_REC_601_525, COLORSPACE_REC_601_625, COLORSPACE_REC_709 } color_space;
-
-       // Note: Rec. 601 and 709 use the same gamma curve.
-       enum { LINEAR_LIGHT, GAMMA_sRGB, GAMMA_REC_601, GAMMA_REC_709 } gamma_curve;
-};
-
-enum EffectId {
-       // Mostly for internal use.
-       GAMMA_CONVERSION = 0,
-       RGB_PRIMARIES_CONVERSION,
-
-       // Color.
-       LIFT_GAMMA_GAIN,
-};
-
-class Effect {
-public: 
-       virtual bool needs_linear_light() { return true; }
-       virtual bool needs_srgb_primaries() { return true; }
-       virtual bool needs_many_samples() { return false; }
-       virtual bool needs_mipmaps() { return false; }
-       bool set_float(const std::string& key, float value);
-       bool set_float_array(const std::string&, const float *values, size_t num_values);
-
-private:
-       bool register_float(const std::string& key, float value);
-       bool register_float_array(const std::string& key, float *values, size_t num_values);
-};      
-
-class EffectChain {
-public:
-       void set_size(unsigned width, unsigned height);
-       void add_input(const ImageFormat &format);
-       Effect *add_effect(EffectId effect);
-       void add_output(const ImageFormat &format);
-
-       void render(unsigned char *src, unsigned char *dst);
-
-private:
-       unsigned width, height;
-       ImageFormat input_format, output_format;
-       std::vector<Effect *> effects;
-};
-
 GLhandleARB read_shader(const char* filename, GLenum type)
 {
-       static char buf[131072];
-       FILE *fp = fopen(filename, "r");
-       if (fp == NULL) {
-               perror(filename);
-               exit(1);
-       }
-
-       int len = fread(buf, 1, sizeof(buf), fp);
-       fclose(fp);
+       std::string shader_src = read_file(filename);
 
        GLhandleARB obj = glCreateShaderObjectARB(type);
-       const GLchar* source[] = { buf };
-       const GLint length[] = { len };
+       const GLchar* source[] = { shader_src.data() };
+       const GLint length[] = { shader_src.size() };
        glShaderSource(obj, 1, source, length);
        glCompileShader(obj);