projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
camera zoom fix, upgrade giflib, configure.ac ix86 probe tweaks, any python
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
trackcanvas.C
diff --git
a/cinelerra-5.1/cinelerra/trackcanvas.C
b/cinelerra-5.1/cinelerra/trackcanvas.C
index bc34475653aef2daed0a3e791f1fdd2df24097d6..27eede528e536bc2a324936ac4fb7d943a3dac89 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-2227,10
+2227,9
@@
int TrackCanvas::do_keyframes(int cursor_x,
if( !result && buttonpress && i == AUTOMATION_SPEED )
mwindow->speed_after(-1);
if( !result && buttonpress && i == AUTOMATION_SPEED )
mwindow->speed_after(-1);
- int current_grouptype = mwindow->edl->local_session->zoombar_showautotype;
- if( result && buttonpress && grouptype != current_grouptype ) {
- mwindow->edl->local_session->zoombar_showautotype = grouptype;
- mwindow->gui->zoombar->update_autozoom();
+ if( result && buttonpress ) {
+ int color = GWindowGUI::auto_colors[i];
+ mwindow->gui->zoombar->update_autozoom(grouptype, color);
}
break; }
}
break; }
@@
-2337,7
+2336,6
@@
int TrackCanvas::do_keyframes(int cursor_x,
new_cursor = UPRIGHT_ARROW_CURSOR;
}
new_cursor = UPRIGHT_ARROW_CURSOR;
}
-
return result;
}
return result;
}
@@
-4035,7
+4033,8
@@
int TrackCanvas::update_drag_floatauto(int cursor_x, int cursor_y)
float change = value - old_value;
current->adjust_to_new_coordinates(position, value);
update_ganged_autos(change, current->autos->track, current);
float change = value - old_value;
current->adjust_to_new_coordinates(position, value);
update_ganged_autos(change, current->autos->track, current);
- show_message(current, 1,", %.2f", current->get_value());
+ int color = GWindowGUI::auto_colors[current->autos->autoidx];
+ show_message(current, color, ", %.2f", current->get_value());
}
break;
}
break;
@@
-4054,7
+4053,8
@@
int TrackCanvas::update_drag_floatauto(int cursor_x, int cursor_y)
value * levered_position(position - current->position,
current->get_control_in_position()));
update_ganged_autos(0, current->autos->track, current);
value * levered_position(position - current->position,
current->get_control_in_position()));
update_ganged_autos(0, current->autos->track, current);
- show_message(current, 1,", %.2f", current->get_control_in_value());
+ int color = GWindowGUI::auto_colors[current->autos->autoidx];
+ show_message(current, color, ", %.2f", current->get_control_in_value());
}
break; }
}
break; }
@@
-4068,7
+4068,8
@@
int TrackCanvas::update_drag_floatauto(int cursor_x, int cursor_y)
value * levered_position(position - current->position,
current->get_control_out_position()));
update_ganged_autos(0, current->autos->track, current);
value * levered_position(position - current->position,
current->get_control_out_position()));
update_ganged_autos(0, current->autos->track, current);
- show_message(current, 1,", %.2f", current->get_control_out_value());
+ int color = GWindowGUI::auto_colors[current->autos->autoidx];
+ show_message(current, color, ", %.2f", current->get_control_out_value());
}
break; }
}
}
break; }
}
@@
-4088,7
+4089,7
@@
int TrackCanvas::update_drag_toggleauto(int cursor_x, int cursor_y)
result = 1;
current->value = value;
current->position = position;
result = 1;
current->value = value;
current->position = position;
- show_message(current,
0,
", %d", current->value);
+ show_message(current,
-1,
", %d", current->value);
}
return result;
}
return result;
@@
-4105,7
+4106,7
@@
int TrackCanvas::update_drag_auto(int cursor_x, int cursor_y)
{
result = 1;
current->position = position;
{
result = 1;
current->position = position;
- show_message(current,
0,
"");
+ show_message(current,
-1,
"");
double position_f = current->autos->track->from_units(current->position);
double center_f = (mwindow->edl->local_session->get_selectionstart(1) +
double position_f = current->autos->track->from_units(current->position);
double center_f = (mwindow->edl->local_session->get_selectionstart(1) +
@@
-4169,7
+4170,7
@@
int TrackCanvas::update_drag_pluginauto(int cursor_x, int cursor_y)
mwindow->session->track_highlighted = track;
result = 1;
current->position = position;
mwindow->session->track_highlighted = track;
result = 1;
current->position = position;
- show_message(current,
0,
"");
+ show_message(current,
-1,
"");
double position_f = current->autos->track->from_units(current->position);
double center_f = (mwindow->edl->local_session->get_selectionstart(1) +
double position_f = current->autos->track->from_units(current->position);
double center_f = (mwindow->edl->local_session->get_selectionstart(1) +
@@
-4680,6
+4681,9
@@
int TrackCanvas::button_release_event()
}
}
}
}
+ if( mwindow->edl->local_session->zoombar_showautocolor >= 0 )
+ mwindow->gui->zoombar->update_autozoom(-1);
+
if (result)
cursor_update(0);
if (result)
cursor_update(0);
@@
-5275,7
+5279,7
@@
int TrackCanvas::button_press_event()
gui->stop_transport("TrackCanvas::button_press_event");
}
gui->stop_transport("TrackCanvas::button_press_event");
}
- int update_overlay = 0, update_cursor = 0, rerender = 0;
+ int update_overlay = 0, update_cursor = 0, rerender = 0
, update_message = 0
;
if(get_buttonpress() == WHEEL_UP) {
if(shift_down())
if(get_buttonpress() == WHEEL_UP) {
if(shift_down())
@@
-5318,6
+5322,7
@@
int TrackCanvas::button_press_event()
if( do_keyframes(cursor_x, cursor_y,
0, get_buttonpress(), new_cursor,
update_cursor, rerender) ) break;
if( do_keyframes(cursor_x, cursor_y,
0, get_buttonpress(), new_cursor,
update_cursor, rerender) ) break;
+ update_message = 1;
// Test edit boundaries
if( do_edit_handles(cursor_x, cursor_y,
1, rerender, update_overlay, new_cursor,
// Test edit boundaries
if( do_edit_handles(cursor_x, cursor_y,
1, rerender, update_overlay, new_cursor,
@@
-5353,6
+5358,7
@@
int TrackCanvas::button_press_event()
update_overlay = 1;
break;
}
update_overlay = 1;
break;
}
+ update_message = 1;
// Test edit boundaries
if( do_edit_handles(cursor_x, cursor_y,
1, rerender, update_overlay, new_cursor, update_cursor) ) break;
// Test edit boundaries
if( do_edit_handles(cursor_x, cursor_y,
1, rerender, update_overlay, new_cursor, update_cursor) ) break;
@@
-5383,9
+5389,12
@@
int TrackCanvas::button_press_event()
gui->update_patchbay();
}
gui->update_patchbay();
}
- if( update_overlay ) {
+ if( update_message )
+ gui->default_message();
+
+ if( update_overlay )
gui->draw_overlays(1);
gui->draw_overlays(1);
- }
+
if( update_cursor < 0 ) {
// double_click edit
gui->swindow->update_selection();
if( update_cursor < 0 ) {
// double_click edit
gui->swindow->update_selection();
@@
-5462,11
+5471,11
@@
double TrackCanvas::time_visible()
}
}
-void TrackCanvas::show_message(Auto *current, int
show_curve_type
, const char *fmt, ...)
+void TrackCanvas::show_message(Auto *current, int
box_color
, const char *fmt, ...)
{
char string[BCTEXTLEN];
char *cp = string, *ep = cp + sizeof(string)-1;
{
char string[BCTEXTLEN];
char *cp = string, *ep = cp + sizeof(string)-1;
- if(
show_curve_type
) {
+ if(
box_color >= 0
) {
cp += snprintf(string, ep-cp, "%-8s ",
FloatAuto::curve_name(((FloatAuto*)current)->curve_mode));
}
cp += snprintf(string, ep-cp, "%-8s ",
FloatAuto::curve_name(((FloatAuto*)current)->curve_mode));
}
@@
-5482,7
+5491,7
@@
void TrackCanvas::show_message(Auto *current, int show_curve_type, const char *f
va_start(ap, fmt);
vsnprintf(cp, ep-cp, fmt, ap);
va_end(ap);
va_start(ap, fmt);
vsnprintf(cp, ep-cp, fmt, ap);
va_end(ap);
- gui->show_message(string);
+ gui->show_message(string
, -1, box_color
);
}
// Patchbay* TrackCanvas::get_patchbay()
}
// Patchbay* TrackCanvas::get_patchbay()