merge hv v6, rework trace methods

[goodguy/history.git] / cinelerra-5.1 / plugins / motion / motionwindow.h

diff --git a/cinelerra-5.1/plugins/motion/motionwindow.h b/cinelerra-5.1/plugins/motion/motionwindow.h
index 4a66a1a6cbdee42e364f1f0f1a1985070b619bce..c52914e45bbae1fa29f4ffec2e2ae9c85f081136 100644 (file)
--- a/cinelerra-5.1/plugins/motion/motionwindow.h
+++ b/cinelerra-5.1/plugins/motion/motionwindow.h
@@ -215,29 +215,29 @@ public:
        MotionMain *plugin;
 };
 
-class GlobalSearchPositions : public BC_PopupMenu
-{
-public:
-       GlobalSearchPositions(MotionMain *plugin, 
-               int x, 
-               int y,
-               int w);
-       void create_objects();
-       int handle_event();
-       MotionMain *plugin;
-};
-
-class RotationSearchPositions : public BC_PopupMenu
-{
-public:
-       RotationSearchPositions(MotionMain *plugin, 
-               int x, 
-               int y,
-               int w);
-       void create_objects();
-       int handle_event();
-       MotionMain *plugin;
-};
+// class GlobalSearchPositions : public BC_PopupMenu
+// {
+// public:
+//     GlobalSearchPositions(MotionMain *plugin, 
+//             int x, 
+//             int y,
+//             int w);
+//     void create_objects();
+//     int handle_event();
+//     MotionMain *plugin;
+// };
+// 
+// class RotationSearchPositions : public BC_PopupMenu
+// {
+// public:
+//     RotationSearchPositions(MotionMain *plugin, 
+//             int x, 
+//             int y,
+//             int w);
+//     void create_objects();
+//     int handle_event();
+//     MotionMain *plugin;
+// };
 
 class MotionMagnitude : public BC_IPot
 {
@@ -305,17 +305,17 @@ public:
        MotionMain *plugin;
 };
 
-class MotionGlobal : public BC_CheckBox
-{
-public:
-       MotionGlobal(MotionMain *plugin, 
-               MotionWindow *gui,
-               int x, 
-               int y);
-       int handle_event();
-       MotionWindow *gui;
-       MotionMain *plugin;
-};
+// class MotionGlobal : public BC_CheckBox
+// {
+// public:
+//     MotionGlobal(MotionMain *plugin, 
+//             MotionWindow *gui,
+//             int x, 
+//             int y);
+//     int handle_event();
+//     MotionWindow *gui;
+//     MotionMain *plugin;
+// };
 
 class MotionRotate : public BC_CheckBox
 {
@@ -353,15 +353,15 @@ public:
        MotionBlockY *block_y;
        MotionBlockXText *block_x_text;
        MotionBlockYText *block_y_text;
-       GlobalSearchPositions *global_search_positions;
-       RotationSearchPositions *rotation_search_positions;
+//     GlobalSearchPositions *global_search_positions;
+//     RotationSearchPositions *rotation_search_positions;
        MotionMagnitude *magnitude;
        MotionRMagnitude *rotate_magnitude;
        MotionReturnSpeed *return_speed;
        MotionRReturnSpeed *rotate_return_speed;
        ActionType *action_type;
        MotionDrawVectors *vectors;
-       MotionGlobal *global;
+//     MotionGlobal *global;
        MotionRotate *rotate;
        AddTrackedFrameOffset *addtrackedframeoffset;
        TrackSingleFrame *track_single;