splashgui text clr, faders/speed keyframe popup slider rework, reticle rework

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

diff --git a/cinelerra-5.1/plugins/motion51/motion51.C b/cinelerra-5.1/plugins/motion51/motion51.C
index b16cdbc9b60b2bb29316ba7354338e3b6112fbee..b61e22442b91109f35c2fa69255a888a2b175374 100644 (file)
--- a/cinelerra-5.1/plugins/motion51/motion51.C
+++ b/cinelerra-5.1/plugins/motion51/motion51.C
@@ -147,7 +147,7 @@ void Motion51Main::save_data(KeyFrame *keyframe)
        FileXML output;
 
 // cause data to be stored directly in text
-       output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
+       output.set_shared_output(keyframe->xbuf);
        output.tag.set_title("MOTION51");
        output.tag.set_property("HORIZ_LIMIT", config.horiz_limit);
        output.tag.set_property("VERT_LIMIT", config.vert_limit);
@@ -172,7 +172,7 @@ void Motion51Main::save_data(KeyFrame *keyframe)
 void Motion51Main::read_data(KeyFrame *keyframe)
 {
        FileXML input;
-       input.set_shared_input(keyframe->get_data(), strlen(keyframe->get_data()));
+       input.set_shared_input(keyframe->xbuf);
        int result = 0;
 
        while( !(result = input.read_tag()) ) {
@@ -578,10 +578,10 @@ int Motion51VVFrame::draw_pixel(int x, int y)
 {
        VFrame::draw_pixel(x+0, y+0);
        for( int i=1; i<n; ++i ) {
-               VFrame::draw_pixel(x-i, y+0);
-               VFrame::draw_pixel(x+0, y+i);
-               VFrame::draw_pixel(x+i, y+0);
-               VFrame::draw_pixel(x+0, y-i);
+               VFrame::draw_pixel(x-i, y-i);
+               VFrame::draw_pixel(x-i, y+i);
+               VFrame::draw_pixel(x+i, y-i);
+               VFrame::draw_pixel(x+i, y+i);
        }
        return 0;
 }
@@ -590,7 +590,11 @@ void Motion51Main::draw_vectors(VFrame *img)
 {
        int iw = img->get_w(), ih = img->get_h();
        int mx = iw > ih ? iw : ih;
-       Motion51VVFrame vfrm(img, mx/800+1);
+       int n = mx/800 + 1;
+       Motion51VVFrame vfrm(img, n);
+       vfrm.set_pixel_color(WHITE);
+       int m = 2;  while( m < n ) m <<= 1;
+       vfrm.set_stiple(2*m);
 
        vfrm.draw_arrow(rx, ry, rx+current_dx, ry+current_dy);
 //     vfrm.draw_smooth(rx-rr,ry, rx-rr,ry+rr, rx,ry+rr);