opengl colorspace + BT2020

[goodguy/history.git] / cinelerra-5.1 / plugins / timefront / timefront.C

diff --git a/cinelerra-5.1/plugins/timefront/timefront.C b/cinelerra-5.1/plugins/timefront/timefront.C
index 2bb074fa36b8b6a869a761a82ffc35e2c0eb4367..2fdfab31492dc960b90890c0b8fef0bb02ea7a94 100644 (file)
--- a/cinelerra-5.1/plugins/timefront/timefront.C
+++ b/cinelerra-5.1/plugins/timefront/timefront.C
@@ -512,7 +512,7 @@ char* TimeFrontRate::to_text(int shape)
                case TimeFrontConfig::LOG:
                        return _("Log");
                default:
-                       return _("Square");
+                       return C_("Square");
        }
 }
 int TimeFrontRate::from_text(char *text)
@@ -746,11 +746,12 @@ int TimeFrontMain::is_synthesis()
                { \
                        unsigned int choice = invertion gradient_row[j]; \
                        { \
-                               out_row[0] = framelist[choice]->get_rows()[i][j * components + 0]; \
-                               out_row[1] = framelist[choice]->get_rows()[i][j * components + 1]; \
-                               out_row[2] = framelist[choice]->get_rows()[i][j * components + 2]; \
+                               type *in_row = (type *)framelist[choice]->get_rows()[i]; \
+                               out_row[0] = in_row[j * components + 0]; \
+                               out_row[1] = in_row[j * components + 1]; \
+                               out_row[2] = in_row[j * components + 2]; \
                                if (components == 4) \
-                                       out_row[3] = framelist[choice]->get_rows()[i][j * components + 3]; \
+                                       out_row[3] = in_row[j * components + 3]; \
                        } \
                        out_row += components; \
                } \
@@ -765,10 +766,8 @@ int TimeFrontMain::process_buffer(VFrame **frame,
 {
        VFrame **outframes = frame;
        VFrame *(framelist[1024]);
-       framelist[0] = new VFrame (
-               outframes[0]->get_w(),
-               outframes[0]->get_h(),
-               outframes[0]->get_color_model());
+       framelist[0] = new VFrame (outframes[0]->get_w(), outframes[0]->get_h(),
+                       outframes[0]->get_color_model(), 0);
        read_frame(framelist[0],
                0,
                start_position,
@@ -798,11 +797,8 @@ int TimeFrontMain::process_buffer(VFrame **frame,
        {
                need_reconfigure = 0;
 
-               if(!gradient) gradient = new VFrame(
-                       outframes[0]->get_w(),
-                       outframes[0]->get_h(),
-                       BC_A8);
-
+               if(!gradient)
+                       gradient = new VFrame( outframes[0]->get_w(), outframes[0]->get_h(), BC_A8, 0); 
 
                if (config.shape != TimeFrontConfig::OTHERTRACK &&
                    config.shape != TimeFrontConfig::ALPHA)
@@ -816,10 +812,8 @@ int TimeFrontMain::process_buffer(VFrame **frame,
        }
        if (config.shape == TimeFrontConfig::ALPHA)
        {
-               if(!gradient) gradient = new VFrame(
-                       outframes[0]->get_w(),
-                       outframes[0]->get_h(),
-                       BC_A8);
+               if(!gradient)
+                       gradient = new VFrame(outframes[0]->get_w(), outframes[0]->get_h(), BC_A8, 0);
                VFrame *tfframe = framelist[0];
                switch (tfframe->get_color_model())
                {
@@ -844,10 +838,8 @@ int TimeFrontMain::process_buffer(VFrame **frame,
        } else
        if (config.shape == TimeFrontConfig::OTHERTRACK)
        {
-               if(!gradient) gradient = new VFrame(
-                       outframes[0]->get_w(),
-                       outframes[0]->get_h(),
-                       BC_A8);
+               if(!gradient)
+                       gradient = new VFrame(outframes[0]->get_w(), outframes[0]->get_h(), BC_A8, 0);
                VFrame *tfframe = outframes[1];
                read_frame(tfframe,
                        1,
@@ -912,10 +904,8 @@ int TimeFrontMain::process_buffer(VFrame **frame,
        {
                for (int i = 1; i <= config.frame_range; i++)
                {
-                       framelist[i] = new VFrame (
-                               outframes[0]->get_w(),
-                               outframes[0]->get_h(),
-                               outframes[0]->get_color_model());
+                       framelist[i] = new VFrame (outframes[0]->get_w(), outframes[0]->get_h(),
+                                       outframes[0]->get_color_model(), 0);
 
                        read_frame(framelist[i],
                                0,