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 2a64845af735e32a78d69bbac13b4298c386ac5c..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"
@@
-253,7
+254,7
@@
int TrackCanvas::drag_motion(Track **over_track,
}
if( !*over_track )
}
if( !*over_track )
- *over_track = pane->
is_
over_patchbay();
+ *over_track = pane->over_patchbay();
return 0;
}
return 0;
}
@@
-281,7
+282,7
@@
int TrackCanvas::drag_stop(int *redraw)
(cursor_y = get_relative_cursor_y()) >= 0 && cursor_y < get_h() )
over_window = 1;
else {
(cursor_y = get_relative_cursor_y()) >= 0 && cursor_y < get_h() )
over_window = 1;
else {
- Track *track = pane->
is_
over_patchbay();
+ Track *track = pane->over_patchbay();
if( track && mwindow->session->track_highlighted == track )
over_window = 1;
}
if( track && mwindow->session->track_highlighted == track )
over_window = 1;
}
@@
-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; }
}
@@
-4721,8
+4706,7
@@
int TrackCanvas::button_press_event()
switch(mwindow->edl->session->editing_mode) {
// Test handles and resource boundaries and highlight a track
case EDITING_ARROW: {
switch(mwindow->edl->session->editing_mode) {
// Test handles and resource boundaries and highlight a track
case EDITING_ARROW: {
- if( mwindow->edl->session->auto_conf->transitions &&
- do_transitions(cursor_x, cursor_y,
+ if( do_transitions(cursor_x, cursor_y,
1, new_cursor, update_cursor) ) break;
if( do_keyframes(cursor_x, cursor_y,
1, new_cursor, update_cursor) ) break;
if( do_keyframes(cursor_x, cursor_y,
@@
-4761,8
+4745,7
@@
int TrackCanvas::button_press_event()
mwindow->edl->session->sample_rate;
//printf("TrackCanvas::button_press_event %d\n", position);
mwindow->edl->session->sample_rate;
//printf("TrackCanvas::button_press_event %d\n", position);
- if(mwindow->edl->session->auto_conf->transitions &&
- do_transitions(cursor_x, cursor_y,
+ if( do_transitions(cursor_x, cursor_y,
1, new_cursor, update_cursor)) break;
if(do_keyframes(cursor_x, cursor_y,
0, get_buttonpress(), new_cursor,
1, new_cursor, update_cursor)) break;
if(do_keyframes(cursor_x, cursor_y,
0, get_buttonpress(), new_cursor,
@@
-4784,6
+4767,7
@@
int TrackCanvas::button_press_event()
if( do_tracks(cursor_x, cursor_y, 1) ) break;
// Highlight selection
if( do_tracks(cursor_x, cursor_y, 1) ) break;
// Highlight selection
+ if( get_buttonpress() != LEFT_BUTTON ) break;
rerender = start_selection(position);
mwindow->session->current_operation = SELECT_REGION;
update_cursor = 1;
rerender = start_selection(position);
mwindow->session->current_operation = SELECT_REGION;
update_cursor = 1;
@@
-4803,17
+4787,17
@@
int TrackCanvas::button_press_event()
if( update_overlay ) {
gui->draw_overlays(1);
}
if( update_overlay ) {
gui->draw_overlays(1);
}
-
- if( update_cursor > 0 ) {
+ if( update_cursor < 0 ) {
+// double_click edit
+ gui->swindow->update_selection();
+ }
+ if( update_cursor ) {
gui->update_timebar(0);
gui->hide_cursor(0);
gui->show_cursor(1);
gui->zoombar->update();
gui->flash_canvas(1);
}
gui->update_timebar(0);
gui->hide_cursor(0);
gui->show_cursor(1);
gui->zoombar->update();
gui->flash_canvas(1);
}
- else if(update_cursor < 0) {
- gui->swindow->update_selection();
- }
}
return result;
}
}
return result;
}