projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
color coded keyframe curves, keyframe popups, cwin scrollbar fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
trackcanvas.C
diff --git
a/cinelerra-5.1/cinelerra/trackcanvas.C
b/cinelerra-5.1/cinelerra/trackcanvas.C
index 5d5b64fe1908dfd8c28208459c82bb06745ff91d..2e21511e31aad2d68ac5bf6d1908607259c78b21 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-38,6
+38,7
@@
#include "edlsession.h"
#include "floatauto.h"
#include "floatautos.h"
#include "edlsession.h"
#include "floatauto.h"
#include "floatautos.h"
+#include "gwindowgui.h"
#include "indexstate.h"
#include "intauto.h"
#include "intautos.h"
#include "indexstate.h"
#include "intauto.h"
#include "intautos.h"
@@
-1868,24
+1869,8
@@
void TrackCanvas::draw_brender_start()
}
}
}
}
-static int auto_colors[AUTOMATION_TOTAL] =
-{
- BLUE,
- RED,
- GREEN,
- BLUE,
- RED,
- GREEN,
- BLUE,
- WHITE,
- 0,
- 0,
- 0,
- WHITE
-};
-
// The operations which correspond to each automation type
// The operations which correspond to each automation type
-
static int
auto_operations[AUTOMATION_TOTAL] =
+
int TrackCanvas::
auto_operations[AUTOMATION_TOTAL] =
{
DRAG_MUTE,
DRAG_CAMERA_X,
{
DRAG_MUTE,
DRAG_CAMERA_X,
@@
-1990,8
+1975,8
@@
int TrackCanvas::do_keyframes(int cursor_x,
auto_keyframe, grouptype);
result = do_float_autos(track, autos,
auto_keyframe, grouptype);
result = do_float_autos(track, autos,
- cursor_x, cursor_y, draw,
-
buttonpress, 0, 0,
auto_colors[i],
+ cursor_x, cursor_y, draw,
buttonpress,
+
0, 0, GWindowGUI::
auto_colors[i],
auto_keyframe, grouptype);
break; }
auto_keyframe, grouptype);
break; }
@@
-2002,8
+1987,8
@@
int TrackCanvas::do_keyframes(int cursor_x,
buttonpress, 1, 1, MDGREY,
auto_keyframe);
result = do_int_autos(track, autos,
buttonpress, 1, 1, MDGREY,
auto_keyframe);
result = do_int_autos(track, autos,
- cursor_x, cursor_y, draw,
-
buttonpress, 0, 0,
auto_colors[i],
+ cursor_x, cursor_y, draw,
buttonpress,
+
0, 0, GWindowGUI::
auto_colors[i],
auto_keyframe);
break; }
}
auto_keyframe);
break; }
}