projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mixer enable playback, home/end fixes, stop throw with exrlist missing file
[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 771b88e7845b13b7405d0ec14a20369143567d9b..88e07d811926598142ce8dbe4f5219c9e18f5338 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-1315,29
+1315,22
@@
void TrackCanvas::draw_highlight_rectangle(int x, int y, int w, int h)
if (x + w <= 0)
{
if (x + w <= 0)
{
- draw_triangle_left(0, y + h /6, h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
+ draw_triangle_left(0, y + h /6,
+ h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
return;
} else
if (x >= get_w())
{
return;
} else
if (x >= get_w())
{
- draw_triangle_right(get_w() - h * 2/3, y + h /6, h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
+ draw_triangle_right(get_w() - h * 2/3, y + h /6,
+ h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
return;
}
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
return;
}
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
- if(x < -10)
- {
- w += x - -10;
- x = -10;
- }
-
- if(y < -10)
- {
- h += y - -10;
- y = -10;
- }
+ if(x < -10) { w += x - -10; x = -10; }
+ if(y < -10) { h += y - -10; y = -10; }
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
@@
-1393,16
+1386,8
@@
void TrackCanvas::draw_highlight_insertion(int x, int y, int w, int h)
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
- if(x < -10)
- {
- w += x - -10;
- x = -10;
- }
- if(y < -10)
- {
- h += y - -10;
- y = -10;
- }
+ if(x < -10) { w += x - -10; x = -10; }
+ if(y < -10) { h += y - -10; y = -10; }
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
set_color(mwindow->preferences->highlight_inverse);
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
set_color(mwindow->preferences->highlight_inverse);
@@
-1443,7
+1428,7
@@
void TrackCanvas::get_handle_coords(Edit *edit, int64_t &x, int64_t &y, int64_t
void TrackCanvas::get_transition_coords(Edit *edit,
int64_t &x, int64_t &y, int64_t &w, int64_t &h)
{
void TrackCanvas::get_transition_coords(Edit *edit,
int64_t &x, int64_t &y, int64_t &w, int64_t &h)
{
- int transition_w =
30, transition_h = 30
;
+ int transition_w =
xS(30), transition_h = yS(30)
;
int has_titles = edit->track->show_titles();
int has_assets = edit->track->show_assets();
double title_bg_h = mwindow->theme->get_image("title_bg_data")->get_h();
int has_titles = edit->track->show_titles();
int has_assets = edit->track->show_assets();
double title_bg_h = mwindow->theme->get_image("title_bg_data")->get_h();
@@
-1695,9
+1680,16
@@
void TrackCanvas::draw_selected(int x, int y, int w, int h)
void TrackCanvas::draw_selected_edits(EDL *edl, int dx, int dy, int color0, int color1)
{
void TrackCanvas::draw_selected_edits(EDL *edl, int dx, int dy, int color0, int color1)
{
+ int dropping = 0;
for( Track *track=edl->tracks->first; track; track=track->next ) {
for( Track *track=edl->tracks->first; track; track=track->next ) {
+ if( !track->record && color1 < 0 ) {
+ if( dropping )
+ dy -= track->vertical_span(mwindow->theme);
+ continue;
+ }
for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
if( !edit->is_selected ) continue;
for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
if( !edit->is_selected ) continue;
+ dropping = 1;
int64_t x, y, w, h;
edit_dimensions(edit, x, y, w, h);
x += dx; y += dy;
int64_t x, y, w, h;
edit_dimensions(edit, x, y, w, h);
x += dx; y += dy;
@@
-1706,10
+1698,10
@@
void TrackCanvas::draw_selected_edits(EDL *edl, int dx, int dy, int color0, int
set_opaque();
int inner = color1 < 0 ? color0 : !edit->group_id ? color0 :
mwindow->get_group_color(edit->group_id);
set_opaque();
int inner = color1 < 0 ? color0 : !edit->group_id ? color0 :
mwindow->get_group_color(edit->group_id);
- set_color(inner);
- draw_selected(x, y, w, h);
int outer = color1 < 0 ? color0 : !edit->group_id ? color1 : inner;
int outer = color1 < 0 ? color0 : !edit->group_id ? color1 : inner;
- set_color(outer);
+ set_color(track->record ? inner : outer);
+ draw_selected(x, y, w, h);
+ set_color(track->record ? outer : inner);
draw_selected(x-1, y-1, w+2, h+2);
draw_selected(x-2, y-2, w+1, h+1);
}
draw_selected(x-1, y-1, w+2, h+2);
draw_selected(x-2, y-2, w+1, h+1);
}
@@
-1801,7
+1793,7
@@
void TrackCanvas::draw_plugins()
toggle_x = MIN(get_w() - right_margin, toggle_x);
// On toggle
toggle_x = MIN(get_w() - right_margin, toggle_x);
// On toggle
- toggle_x -= PluginOn::calculate_w(mwindow) +
10
;
+ toggle_x -= PluginOn::calculate_w(mwindow) +
xS(10)
;
if(toggle_x > min_x)
{
if(current_on >= plugin_on_toggles.total)
if(toggle_x > min_x)
{
if(current_on >= plugin_on_toggles.total)
@@
-1821,7
+1813,7
@@
void TrackCanvas::draw_plugins()
if(plugin->plugin_type == PLUGIN_STANDALONE)
{
// Show
if(plugin->plugin_type == PLUGIN_STANDALONE)
{
// Show
- toggle_x -= PluginShow::calculate_w(mwindow) +
10
;
+ toggle_x -= PluginShow::calculate_w(mwindow) +
xS(10)
;
if(toggle_x > min_x)
{
if(current_show >= plugin_show_toggles.total)
if(toggle_x > min_x)
{
if(current_show >= plugin_show_toggles.total)
@@
-1836,7
+1828,7
@@
void TrackCanvas::draw_plugins()
}
current_show++;
}
}
current_show++;
}
- toggle_x -= PluginPresetEdit::calculate_w(mwindow) +
10
;
+ toggle_x -= PluginPresetEdit::calculate_w(mwindow) +
xS(10)
;
if(toggle_x > min_x)
{
if(current_preset >= preset_edit_buttons.total)
if(toggle_x > min_x)
{
if(current_preset >= preset_edit_buttons.total)
@@
-1904,6
+1896,8
@@
void TrackCanvas::draw_hard_edges()
for(Edit *edit = track->edits->first; edit; edit = edit->next) {
if( !edit->hard_left && !edit->hard_right ) continue;
edit_dimensions(edit, x, y, w, h);
for(Edit *edit = track->edits->first; edit; edit = edit->next) {
if( !edit->hard_left && !edit->hard_right ) continue;
edit_dimensions(edit, x, y, w, h);
+ if( !MWindowGUI::visible(x, x + w, 0, get_w()) ||
+ !MWindowGUI::visible(y, y + h, 0, get_h()) ) continue;
set_color(GREEN);
set_opaque();
int y1 = y;
set_color(GREEN);
set_opaque();
int y1 = y;
@@
-1991,19
+1985,19
@@
void TrackCanvas::draw_drag_handle()
edit_dimensions(edit, x, y, w, h);
if( y+h < 0 || y >= get_h() ) continue;
int edge_x = !drag_handle ? x : x + w;
edit_dimensions(edit, x, y, w, h);
if( y+h < 0 || y >= get_h() ) continue;
int edge_x = !drag_handle ? x : x + w;
- int edge_y = y + h/2,
k = 10
;
+ int edge_y = y + h/2,
xs10 = xS(10), ys10 = yS(10)
;
if( edge_x >= 0 && edge_x < get_w() ) {
if( !can_drag ) {
if( edge_x >= 0 && edge_x < get_w() ) {
if( !can_drag ) {
- draw_line(edge_x-
k,edge_y-k, edge_x+k,edge_y+k
);
- draw_line(edge_x-
k,edge_y+k, edge_x+k,edge_y-k
);
+ draw_line(edge_x-
xs10,edge_y-ys10, edge_x+xs10,edge_y+ys10
);
+ draw_line(edge_x-
xs10,edge_y+ys10, edge_x+xs10,edge_y-ys10
);
}
else if( !drag_handle ) {
}
else if( !drag_handle ) {
- draw_line(edge_x+
k,edge_y-k
, edge_x,edge_y);
- draw_line(edge_x+
k,edge_y+k
, edge_x,edge_y);
+ draw_line(edge_x+
xs10,edge_y-ys10
, edge_x,edge_y);
+ draw_line(edge_x+
xs10,edge_y+ys10
, edge_x,edge_y);
}
else {
}
else {
- draw_line(edge_x,edge_y, edge_x-
k,edge_y-k
);
- draw_line(edge_x,edge_y, edge_x-
k,edge_y+k
);
+ draw_line(edge_x,edge_y, edge_x-
xs10,edge_y-ys10
);
+ draw_line(edge_x,edge_y, edge_x-
xs10,edge_y+ys10
);
}
}
edge_x += delta;
}
}
edge_x += delta;
@@
-3688,8
+3682,8
@@
int TrackCanvas::draw_hairline(Auto *auto_keyframe, int color, int show)
}
if( show ) {
int font = MEDIUMFONT;
}
if( show ) {
int font = MEDIUMFONT;
- int tw = get_text_width(font, text) +
TOOLTIP_MARGIN
* 2;
- int th = get_text_height(font, text) +
TOOLTIP_MARGIN
* 2;
+ int tw = get_text_width(font, text) +
xS(TOOLTIP_MARGIN)
* 2;
+ int th = get_text_height(font, text) +
yS(TOOLTIP_MARGIN)
* 2;
set_color(get_resources()->tooltip_bg_color);
ax += HANDLE_W/2;
ay += center_pixel + HANDLE_W/2;
set_color(get_resources()->tooltip_bg_color);
ax += HANDLE_W/2;
ay += center_pixel + HANDLE_W/2;
@@
-3697,8
+3691,8
@@
int TrackCanvas::draw_hairline(Auto *auto_keyframe, int color, int show)
set_color(BLACK);
draw_rectangle(ax, ay, tw, th);
set_font(font);
set_color(BLACK);
draw_rectangle(ax, ay, tw, th);
set_font(font);
- ax +=
TOOLTIP_MARGIN
;
- ay +=
TOOLTIP_MARGIN
+ get_text_ascent(font);
+ ax +=
xS(TOOLTIP_MARGIN)
;
+ ay +=
yS(TOOLTIP_MARGIN)
+ get_text_ascent(font);
draw_text(ax, ay, text);
}
return 0;
draw_text(ax, ay, text);
}
return 0;
@@
-3709,13
+3703,7
@@
void TrackCanvas::draw_overlays()
int new_cursor, update_cursor, rerender;
// Move background pixmap to foreground pixmap
int new_cursor, update_cursor, rerender;
// Move background pixmap to foreground pixmap
- draw_pixmap(background_pixmap,
- 0,
- 0,
- get_w(),
- get_h(),
- 0,
- 0);
+ draw_pixmap(background_pixmap, 0, 0, get_w(), get_h(), 0, 0);
// In/Out points
draw_inout_points();
// In/Out points
draw_inout_points();
@@
-5066,25
+5054,29
@@
int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
return result;
}
return result;
}
-
+// returns -1=doesnt fit, 1=fits, 0=fits but overwrites
int TrackCanvas::test_track_group(EDL *group, Track *first_track, double &pos)
{
int TrackCanvas::test_track_group(EDL *group, Track *first_track, double &pos)
{
+ int intersects = 0;
Track *src = group->tracks->first;
for( Track *track=first_track; track && src; track=track->next ) {
Track *src = group->tracks->first;
for( Track *track=first_track; track && src; track=track->next ) {
- if( !track->record )
continue
;
+ if( !track->record )
return -1
;
if( src->data_type != track->data_type ) return -1;
for( Edit *src_edit=src->edits->first; src_edit; src_edit=src_edit->next ) {
if( src_edit->silence() ) continue;
if( src->data_type != track->data_type ) return -1;
for( Edit *src_edit=src->edits->first; src_edit; src_edit=src_edit->next ) {
if( src_edit->silence() ) continue;
- if( edit_intersects(track, src_edit, pos) ) return 0;
+ if( !intersects && edit_intersects(track, src_edit, pos) )
+ intersects = 1;
}
src = src->next;
}
}
src = src->next;
}
- return
!src
? 1 : 0;
+ return
src ? -1 : !intersects
? 1 : 0;
}
int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
{
if( pos < 0 ) { pos = 0; return 1; }
}
int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
{
if( pos < 0 ) { pos = 0; return 1; }
+ int pane_no = pane->number;
+ int cur_pix = track->edl->get_position_cursorx(pos, pane_no);
int64_t src_start = src_edit->startproject;
int64_t src_end = src_start + src_edit->length;
double new_start = src_edit->track->from_units(src_start) + pos;
int64_t src_start = src_edit->startproject;
int64_t src_end = src_start + src_edit->length;
double new_start = src_edit->track->from_units(src_start) + pos;
@@
-5097,6
+5089,7
@@
int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
if( edit_start >= trk_end ) continue;
int64_t edit_end = edit_start + edit->length;
if( trk_start >= edit_end ) continue;
if( edit_start >= trk_end ) continue;
int64_t edit_end = edit_start + edit->length;
if( trk_start >= edit_end ) continue;
+
int64_t lt_dist = labs(trk_end - edit_start);
int64_t rt_dist = labs(edit_end - trk_start);
int64_t position;
int64_t lt_dist = labs(trk_end - edit_start);
int64_t rt_dist = labs(edit_end - trk_start);
int64_t position;
@@
-5114,7
+5107,10
@@
int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
if( lt_dist > rt_dist )
position -= src_end;
}
if( lt_dist > rt_dist )
position -= src_end;
}
- pos = edit->track->from_units(position);
+ double new_pos = edit->track->from_units(position);
+ int new_pix = track->edl->get_position_cursorx(new_pos, pane_no);
+ if( abs(new_pix-cur_pix) < HANDLE_W )
+ pos = new_pos;
return 1;
}
return 0;
return 1;
}
return 0;