merged hv7 mod

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

diff --git a/cinelerra-5.1/plugins/motion-hv/motion-hv.C b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
index 3b0b128ab7e500e31baf8eab232b93f6ea6f4480..b61c654a2d9aa9bbb98518b56124ee7f0e921ec9 100644 (file)
--- a/cinelerra-5.1/plugins/motion-hv/motion-hv.C
+++ b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
@@ -120,7 +120,8 @@ int MotionHVConfig::equivalent(MotionHVConfig &that)
                track_frame == that.track_frame &&
                bottom_is_master == that.bottom_is_master &&
                horizontal_only == that.horizontal_only &&
-               vertical_only == that.vertical_only;
+               vertical_only == that.vertical_only &&
+               tracking_type == that.tracking_type;
 }
 
 void MotionHVConfig::copy_from(MotionHVConfig &that)
@@ -332,7 +333,7 @@ void MotionHVMain::save_data(KeyFrame *keyframe)
 
 // cause data to be stored directly in text
        output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
-       output.tag.set_title("MOTION");
+       output.tag.set_title("MOTIONHV");
 
        output.tag.set_property("BLOCK_COUNT", config.block_count);
 //     output.tag.set_property("GLOBAL_POSITIONS", config.global_positions);
@@ -362,7 +363,7 @@ void MotionHVMain::save_data(KeyFrame *keyframe)
        output.tag.set_property("HORIZONTAL_ONLY", config.horizontal_only);
        output.tag.set_property("VERTICAL_ONLY", config.vertical_only);
        output.append_tag();
-       output.tag.set_title("/MOTION");
+       output.tag.set_title("/MOTIONHV");
        output.append_tag();
        output.terminate_string();
 }
@@ -381,7 +382,7 @@ void MotionHVMain::read_data(KeyFrame *keyframe)
 
                if(!result)
                {
-                       if(input.tag.title_is("MOTION"))
+                       if(input.tag.title_is("MOTIONHV"))
                        {
                                config.block_count = input.tag.get_property("BLOCK_COUNT", config.block_count);
 //                             config.global_positions = input.tag.get_property("GLOBAL_POSITIONS", config.global_positions);