edl plugin names eng, fix segv for opengl brender, renderfarm rework strategy, perf...

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

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index e52da6db3b74ef5482357d34638ce54538f1db82..940462b144ee0363fb52b02da52258b6a90d7c22 100644 (file)
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -543,7 +543,7 @@ TitleUnit::TitleUnit(TitleMain *plugin, TitleEngine *server)
 static void get_mask_colors(int rgb, int color_model, int &rr, int &gg, int &bb)
 {
        int r = 0xff & (rgb>>16), g = 0xff & (rgb>>8), b = 0xff & (rgb>>0);
-       if( BC_CModels::is_yuv(color_model) ) bc_rgb2yuv(r,g,b, r,g,b);
+       if( BC_CModels::is_yuv(color_model) ) YUV::yuv.rgb_to_yuv_8(r,g,b);
        rr = r;  gg = g; bb = b;
 }
 
@@ -1144,7 +1144,7 @@ TitleMain::~TitleMain()
        delete outline_engine;
 }
 
-const char* TitleMain::plugin_title() { return C_("Title"); }
+const char* TitleMain::plugin_title() { return N_("Title"); }
 int TitleMain::is_realtime() { return 1; }
 int TitleMain::is_synthesis() { return 1; }
 
@@ -1464,7 +1464,7 @@ void TitleMain::draw_background()
                        delete bg_frame;  bg_frame = 0;
                }
                if( !bg_frame )
-                       bg_frame = new VFrame(0, -1, bw, bh, output_model, -1);
+                       bg_frame = new VFrame(bw, bh, output_model);
                int64_t position = get_source_position() - get_source_start();
                if( !read_background(bg_frame, position, output_model) ) {
                        if( !overlay_frame )
@@ -1607,7 +1607,8 @@ VFrame *TitleMain::add_image(const char *path)
        VFrame *vframe = get_image(path);
        if( !vframe && (vframe=VFramePng::vframe_png(path)) != 0 ) {
                if( vframe->get_color_model() != text_model ) {
-                       VFrame *frame = new VFrame(vframe->get_w(), vframe->get_h(), text_model);
+                       VFrame *frame = new VFrame(vframe->get_w(), vframe->get_h(),
+                               text_model, 0);
                        frame->transfer_from(vframe);  delete vframe;
                        vframe = frame;
                }