// Find the edit and track the cursor is over
for(Track *track = mwindow->edl->tracks->first; track; track = track->next)
{
+ if( track->is_hidden() ) continue;
int64_t track_x, track_y, track_w, track_h;
track_dimensions(track, track_x, track_y, track_w, track_h);
mwindow->session->edit_highlighted->length);
}
start = mwindow->edl->align_to_frame(start, 0);
- mwindow->insert_effects_canvas(start, length);
+ mwindow->insert_effects_canvas(track, start, length);
*redraw = 1;
}
if( mwindow->session->track_highlighted )
gui->resource_pixmaps.remove_all_objects();
if(debug) PRINT_TRACE
+ if(mode != IGNORE_THREAD)
+ gui->resource_thread->reset(pane->number, indexes_only);
// Search every edit
for(Track *current = mwindow->edl->tracks->first;
current;
current = NEXT)
{
+ if( current->is_hidden() ) continue;
if(debug) PRINT_TRACE
for(Edit *edit = current->edits->first; edit; edit = edit->next)
{
}
}
+ int64_t track_x, track_y, track_w, track_h;
+ track_dimensions(current,
+ track_x, track_y, track_w, track_h);
+ set_color((~get_resources()->get_bg_color()) & 0xffffff);
+ set_opaque();
+ int x1 = track_x, x2 = x1+track_w;
+ int y1 = track_y+track_h-1;
+ draw_line(x1,y1, x2,y1, background_pixmap);
}
// }
// }
- pixmap_h = mwindow->edl->local_session->zoom_track;
Track *track = edit->edits->track;
+ pixmap_h = track->data_h;
if( track->show_titles() )
pixmap_h += mwindow->theme->get_image("title_bg_data")->get_h();
//printf("get_pixmap_size %d %d %d %d\n", edit_x, edit_w, pixmap_x, pixmap_w);
if( edit->track->show_titles() )
edit_h += mwindow->theme->get_image("title_bg_data")->get_h();
if( edit->track->show_assets() )
- edit_h += resource_h();
+ edit_h += edit->track->data_h;
h = edit_h;
}
for(Track *dest = mwindow->session->track_highlighted;
dest;
dest = dest->next) {
- if(dest->record) {
+ if( dest->is_hidden() ) continue;
+ if(dest->is_armed()) {
// Get source width in pixels
w = -1;
// Use start of highlighted edit
if( plugin->track->show_titles() )
y += mwindow->theme->get_image("title_bg_data")->get_h();
if( plugin->track->show_assets() )
- y += resource_h();
+ y += plugin->track->data_h;
y += plugin->plugin_set->get_number() *
mwindow->theme->get_image("plugin_bg_data")->get_h();
h = mwindow->theme->get_image("plugin_bg_data")->get_h();
}
-int TrackCanvas::resource_h()
-{
- return mwindow->edl->local_session->zoom_track;
-}
void TrackCanvas::draw_highlight_rectangle(int x, int y, int w, int h)
{
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())
{
- 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;};
- 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);
// 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);
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();
- double asset_h = resource_h();
- double ys = has_assets ? asset_h : has_titles ? title_bg_h : 0;
+ int data_h = edit->track->data_h;
+ double ys = has_assets ? data_h : has_titles ? title_bg_h : 0;
double dy = has_titles ?
- ( has_assets ? title_bg_h + asset_h/2 : title_bg_h/2 ) :
- ( has_assets ? asset_h/2 : 0) ;
+ ( has_assets ? title_bg_h + data_h/2 : title_bg_h/2 ) :
+ ( has_assets ? data_h/2 : 0) ;
double title_h = mwindow->theme->title_h;
if( dy < title_h / 2 ) { ys = title_h; dy = ys / 2; }
y += dy;
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 ) {
+ if( track->is_hidden() ) continue;
+ if( !track->is_armed() && 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;
+ dropping = 1;
int64_t x, y, w, h;
edit_dimensions(edit, x, y, w, h);
x += dx; y += dy;
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;
- set_color(outer);
+ set_color(track->is_armed() ? inner : outer);
+ draw_selected(x, y, w, h);
+ set_color(track->is_armed() ? outer : inner);
draw_selected(x-1, y-1, w+2, h+2);
draw_selected(x-2, y-2, w+1, h+1);
}
track;
track = track->next)
{
+ if( track->is_hidden() ) continue;
if(track->expand_view)
{
for(int i = 0; i < track->plugin_set.total; i++)
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(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)
}
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)
void TrackCanvas::draw_hard_edges()
{
+ if( !mwindow->edl->session->auto_conf->hard_edges )
+ return;
int64_t x, y, w, h;
for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
+ if( track->is_hidden() ) continue;
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;
if( track->show_titles() )
y1 += mwindow->theme->get_image("title_bg_data")->get_h();
if( track->show_assets() )
- y1 += resource_h();
+ y1 += track->data_h;
if( y1 == y )
y1 += mwindow->theme->title_h;
if( edit->hard_left ) {
set_line_width(3);
for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
+ if( track->is_hidden() ) continue;
Edit *left = 0, *right = 0;
double start = DBL_MAX, end = DBL_MIN;
for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
idxbl->get_audio_samples() :
edit->track->data_type == TRACK_VIDEO ?
idxbl->get_video_frames() : -1;
- if( edit->startsource + edit->length >= source_len )
+ int64_t speed_start = edit->startproject;
+ int64_t speed_end = speed_start + edit->length;
+ int64_t speed_length = track->speed_length(speed_start, speed_end);
+ if( edit->startsource + speed_length >= source_len )
can_drag = 0;
}
else if( !edit->startsource )
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 ) {
- 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 ) {
- 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 {
- 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;
int64_t x, y, w, h;
for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
+ if( track->is_hidden() ) continue;
if( !track->show_transitions() ) continue;
for(Edit *edit = track->edits->first; edit; edit = edit->next) {
// track context menu to appear
int result = 0;
EDLSession *session = mwindow->edl->session;
-
-
+ int gang = session->gang_tracks != GANG_NONE || get_double_click() ? 1 : 0;
static BC_Pixmap *auto_pixmaps[AUTOMATION_TOTAL] =
{
for(Track *track = mwindow->edl->tracks->first;
track && !result;
track = track->next) {
+ if( track->is_hidden() ) continue;
Auto *auto_keyframe = 0;
Automation *automation = track->automation;
if (buttonpress != 3)
{
if(i == AUTOMATION_FADE || i == AUTOMATION_SPEED)
- fill_ganged_autos(get_double_click(), 0, track,
+ fill_ganged_autos(gang, 0, track,
(FloatAuto*)mwindow->session->drag_auto);
mwindow->session->current_operation = pre_auto_operations[i];
update_drag_caption();
keyframe_hairline == HAIRLINE_DRAGGING && dragging ) ) {
int show = dragging || keyframe_hairline == HAIRLINE_ALWAYS ? 1 : 0;
for( Track *track = mwindow->edl->tracks->first; track; track=track->next ) {
+ if( track->is_hidden() ) continue;
Automation *automation = track->automation;
for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
if( !mwindow->edl->session->auto_conf->autos[i] ) continue;
}
}
-void TrackCanvas::draw_auto(Auto *current,
- int x,
- int y,
- int center_pixel,
- int zoom_track)
+void TrackCanvas::draw_auto(Auto *current, int x, int y,
+ int center_pixel, int data_h)
{
int x1, y1, x2, y2;
y1 = center_pixel + y - HANDLE_W / 2;
y2 = center_pixel + y + HANDLE_W / 2;
- if(y1 < center_pixel + -zoom_track / 2) y1 = center_pixel + -zoom_track / 2;
- if(y2 > center_pixel + zoom_track / 2) y2 = center_pixel + zoom_track / 2;
+ if( y1 < center_pixel - data_h/2 ) y1 = center_pixel - data_h/2;
+ if( y2 > center_pixel + data_h/2 ) y2 = center_pixel + data_h/2;
draw_box(x1, y1, x2 - x1, y2 - y1);
}
}
-void TrackCanvas::draw_floatauto(FloatAuto *current,
- int x,
- int y,
- int in_x,
- int in_y,
- int out_x,
- int out_y,
- int center_pixel,
- int zoom_track,
- int color)
+void TrackCanvas::draw_floatauto(FloatAuto *current, int x, int y,
+ int in_x, int in_y, int out_x, int out_y,
+ int center_pixel, int data_h, int color)
{
int x1 = x - HANDLE_W / 2; // Center
int x2 = x + HANDLE_W / 2;
int y1 = center_pixel + y - HANDLE_H / 2;
int y2 = center_pixel + y + HANDLE_H / 2;
- int ymin = center_pixel - zoom_track / 2;
- int ymax = center_pixel + zoom_track / 2;
+ int ymin = center_pixel - data_h / 2;
+ int ymax = center_pixel + data_h / 2;
CLAMP(y1, ymin, ymax);
CLAMP(y2, ymin, ymax);
return;
if(in_x != x)
- draw_floatauto_ctrlpoint(x, y, in_x, in_y, center_pixel, zoom_track, color);
+ draw_floatauto_ctrlpoint(x, y, in_x, in_y, center_pixel, data_h, color);
if(out_x != x)
- draw_floatauto_ctrlpoint(x, y, out_x, out_y, center_pixel, zoom_track, color);
+ draw_floatauto_ctrlpoint(x, y, out_x, out_y, center_pixel, data_h, color);
}
inline int quantize(float f) { return (int)floor(f + 0.5); }
inline void TrackCanvas::draw_floatauto_ctrlpoint(
- int x, int y, int cp_x, int cp_y, int center_pixel,
- int zoom_track, int color)
+ int x, int y, int cp_x, int cp_y, int center_pixel,
+ int data_h, int color)
// draw the tangent and a handle for given bézier ctrl point
{
- bool handle_visible = (abs(cp_y) <= zoom_track / 2);
+ bool handle_visible = (abs(cp_y) <= data_h/2);
float slope = (float)(cp_y - y)/(cp_x - x);
- CLAMP(cp_y, -zoom_track / 2, zoom_track / 2);
+ CLAMP(cp_y, -data_h/2, data_h/2);
if(slope != 0)
cp_x = x + quantize((cp_y - y) / slope);
int TrackCanvas::test_auto(Auto *current,
- int x, int y, int center_pixel, int zoom_track,
+ int x, int y, int center_pixel, int data_h,
int cursor_x, int cursor_y, int buttonpress)
{
int x1, y1, x2, y2;
x2 = x + HANDLE_W / 2;
y1 = center_pixel + y - HANDLE_H / 2;
y2 = center_pixel + y + HANDLE_H / 2;
- int ymin = center_pixel - zoom_track / 2;
- int ymax = center_pixel + zoom_track / 2;
+ int ymin = center_pixel - data_h/2;
+ int ymax = center_pixel + data_h/2;
CLAMP(y1, ymin, ymax);
CLAMP(y2, ymin, ymax);
int TrackCanvas::test_floatauto(FloatAuto *current, int x, int y, int in_x,
- int in_y, int out_x, int out_y, int center_pixel, int zoom_track,
+ int in_y, int out_x, int out_y, int center_pixel, int data_h,
int cursor_x, int cursor_y, int buttonpress, int autogrouptype)
{
int result = 0;
int x2 = x + HANDLE_W / 2;
int y1 = center_pixel + y - HANDLE_W / 2;
int y2 = center_pixel + y + HANDLE_W / 2;
- int ymin = center_pixel - zoom_track / 2;
- int ymax = center_pixel + zoom_track / 2;
+ int ymin = center_pixel - data_h/2;
+ int ymax = center_pixel + data_h/2;
CLAMP(y1, ymin, ymax);
CLAMP(y2, ymin, ymax);
return result;
}
+static int is_linear(FloatAuto *prev, FloatAuto *next)
+{
+ if( !prev || !next ) return 1;
+ if( prev->curve_mode == FloatAuto::LINEAR ) return 1;
+ int64_t ipos = prev->get_control_in_position();
+ int64_t opos = prev->get_control_out_position();
+ if( !ipos && !opos ) return 1;
+ if( !ipos || !opos ) return 0;
+ float ival = prev->get_control_in_value();
+ float oval = prev->get_control_out_value();
+ float cval = prev->get_value(), nval = next->get_value();
+ if( !ival && !oval && EQUIV(cval, nval) ) return 1;
+ float ig = ival / ipos, og = oval / opos;
+ int64_t cpos = prev->position, npos = next->position;
+ float g = (nval - cval) / (npos - cpos);
+ if( EQUIV(ig, g) && EQUIV(og, g) ) return 1;
+ return 0;
+}
// Get the float value & y for position x on the canvas
#define X_TO_FLOATLINE(x) \
int x1, int y1, int x2, int y2,
int color, int autogrouptype)
{
+ int ytop = center_pixel - yscale / 2;
+ int ybot = center_pixel + yscale / 2 - 1;
+ y1 += center_pixel; y2 += center_pixel;
+ if( (y1 < ytop && y1 >= ybot) && (y2 < ytop || y2 >= ybot) ) return;
+// check for line draw
+ if( is_linear(previous, next) ) {
+ draw_line(x1, y1, x2, y2);
+ return;
+ }
+
// Solve bezier equation for either every pixel or a certain large number of
// points.
// Not using slope intercept
x1 = MAX(0, x1);
- int prev_y = y1 + center_pixel;
-
+ draw_pixel(x1, y1);
+ int prev_y = y1;
// Call by reference fails for some reason here
FloatAuto *previous1 = previous, *next1 = next;
float automation_min = mwindow->edl->local_session->automation_mins[autogrouptype];
float automation_max = mwindow->edl->local_session->automation_maxs[autogrouptype];
float automation_range = automation_max - automation_min;
-
- for(int x = x1; x < x2; x++)
- {
+ if( autogrouptype == AUTOGROUPTYPE_SPEED && automation_range < SPEED_MIN )
+ automation_range = SPEED_MIN;
+ for( int x=x1; x<x2; ++x ) {
// Interpolate value between frames
X_TO_FLOATLINE(x)
- if(/* x > x1 && */
- y >= center_pixel - yscale / 2 &&
- y < center_pixel + yscale / 2 - 1)
- {
-// printf("TrackCanvas::draw_floatline y=%d min=%d max=%d\n",
-// y,
-// (int)(center_pixel - yscale / 2),
-// (int)(center_pixel + yscale / 2 - 1));
-
-//printf("draw_line(%d,%d, %d,%d)\n", x - 1, prev_y , x, y);
- draw_line(x - 1, prev_y , x, y );
+ if( /* x > x1 && */ y >= ytop && y < ybot ) {
+ int x1 = x-1, y1 = prev_y, x2 = x, y2 = y;
+ if( abs(y2-y1) < 2 )
+ draw_pixel(x2, y2);
+ else
+ draw_bline(x1, y1, x2, y2);
}
prev_y = y;
}
}
-
-
-
int TrackCanvas::test_floatline(int center_pixel,
FloatAutos *autos,
double unit_start,
float automation_min = mwindow->edl->local_session->automation_mins[autogrouptype];
float automation_max = mwindow->edl->local_session->automation_maxs[autogrouptype];
float automation_range = automation_max - automation_min;
+ if( autogrouptype == AUTOGROUPTYPE_SPEED && automation_range < SPEED_MIN )
+ automation_range = SPEED_MIN;
FloatAuto *previous1 = 0, *next1 = 0;
X_TO_FLOATLINE(cursor_x);
void TrackCanvas::fill_ganged_autos(int all, float change, Track *skip, FloatAuto *fauto)
{
- if( !skip->gang ) return;
+ if( !skip->is_ganged() ) return;
// Handles the special case of modifying a fadeauto
// when there are ganged faders on several tracks
double position = skip->from_units(fauto->position);
for(Track *current = mwindow->edl->tracks->first; current; current = NEXT) {
if( (all || current->data_type == skip->data_type) &&
- current->gang && current->record && current != skip ) {
+ current->armed_gang(skip) && current->is_armed() &&
+ current != skip ) {
FloatAutos *fade_autos = (FloatAutos*)current->automation->autos[autoidx];
float auto_min = mwindow->edl->local_session->automation_mins[fade_autos->autogrouptype];
float auto_max = mwindow->edl->local_session->automation_maxs[fade_autos->autogrouptype];
CLAMP(new_value, auto_min, auto_max);
keyframe->adjust_to_new_coordinates(current_position, new_value);
}
- else {
+ else if( all >= 0 ) {
// create keyframe on neighbouring track at the point in time given by fauto
FloatAuto *previous = 0, *next = 0;
float value = fade_autos->get_value(current_position, PLAY_FORWARD, previous, next);
keyframe = (FloatAuto*)fade_autos->insert_auto(current_position);
keyframe->set_value(new_value);
}
+ if( !keyframe ) continue;
mwindow->session->drag_auto_gang->append((Auto *)keyframe);
}
}
int has_titles = track->show_titles();
int has_assets = track->show_assets();
double title_bg_h = mwindow->theme->get_image("title_bg_data")->get_h();
- double asset_h = resource_h();
double title_h = mwindow->theme->title_h;
- double ys = has_assets ? asset_h : has_titles ? title_bg_h : 0;
+ double data_h = track->data_h;
+ double ys = has_assets ? data_h : has_titles ? title_bg_h : 0;
double dy = has_titles ?
- ( has_assets ? title_bg_h + asset_h/2 : title_bg_h/2) :
- ( has_assets ? asset_h/2 : 0) ;
+ ( has_assets ? title_bg_h + data_h/2 : title_bg_h/2) :
+ ( has_assets ? data_h/2 : 0) ;
if( dy < title_h/2 ) { ys = title_h; dy = ys / 2; }
yscale = ys;
center_pixel = y + dy;
float automation_min = mwindow->edl->local_session->automation_mins[autogrouptype];
float automation_max = mwindow->edl->local_session->automation_maxs[autogrouptype];
float automation_range = automation_max - automation_min;
+ if( autogrouptype == AUTOGROUPTYPE_SPEED && automation_range < SPEED_MIN )
+ automation_range = SPEED_MIN;
FloatAuto *ptr = (FloatAuto*)current;
*x = (double)(ptr->position - unit_start) / zoom_units;
*y = ((ptr->get_value() - automation_min) / automation_range - 0.5) * -yscale;
// Draw or test handle
if( current && !result && current != autos->default_auto ) {
- if( !draw && track->record ) {
+ if( !draw && track->is_armed() ) {
result = test_floatauto((FloatAuto*)current, (int)ax2, (int)ay2,
(int)in_x2, (int)in_y2, (int)out_x2, (int)out_y2,
(int)center_pixel, (int)yscale, cursor_x, cursor_y,
}
// Draw or test joining line
- if( !draw && !result && track->record /* && buttonpress != 3 */ ) {
+ if( !draw && !result && track->is_armed() /* && buttonpress != 3 */ ) {
result = test_floatline(center_pixel,
(FloatAutos*)autos, unit_start, zoom_units, yscale,
// Exclude auto coverage from the end of the line. The auto overlaps
if( ax < get_w() && !result ) {
ax2 = get_w(); ay2 = ay;
- if(!draw && track->record /* && buttonpress != 3 */ ) {
+ if(!draw && track->is_armed() /* && buttonpress != 3 */ ) {
result = test_floatline(center_pixel,
(FloatAutos*)autos, unit_start, zoom_units, yscale,
(int)ax, (int)ax2, cursor_x, cursor_y,
{
if(!draw)
{
- if(track->record)
+ if(track->is_armed())
{
result = test_auto(current,
(int)ax2,
{
if(!result)
{
- if(track->record /* && buttonpress != 3 */)
+ if(track->is_armed() /* && buttonpress != 3 */)
{
result = test_toggleline(autos,
center_pixel,
ay2 = ay;
if(!draw)
{
- if(track->record /* && buttonpress != 3 */)
+ if(track->is_armed() /* && buttonpress != 3 */)
{
result = test_toggleline(autos,
center_pixel,
if( track->show_titles() )
center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
if( track->show_assets() )
- center_pixel += resource_h();
+ center_pixel += track->data_h;
center_pixel += (i + 0.5) * mwindow->theme->get_image("plugin_bg_data")->get_h();
for(Plugin *plugin = (Plugin*)plugin_set->first;
}
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(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;
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();
!vrender->process_buffer(&vlt, left, 0) &&
!vrender->process_buffer(&vrt, pos , 0) ? 0 : 1;
delete render_engine;
- delete video_cache;
+ video_cache->remove_user();
mwindow->cwindow->gui->lock_window("TrackCanvas::render_handle_frame 0");
Canvas *canvas = mwindow->cwindow->gui->canvas;
- int w = canvas->w, h = canvas->h, w2 = w/2, h2 = h/2;
- int lx = 0, ly = h2/2, rx = w2, ry = h2/2;
+ float ox1, oy1, ox2, oy2, cx1, cy1, cx2, cy2;
+ canvas->get_transfers(edl, ox1, oy1, ox2, oy2, cx1, cy1, cx2, cy2);
+ float cw = canvas->w/2, ch = canvas->h/2;
+ float cdx = (cx2 - cx1)/2, cdy = (cy2 - cy1)/2;
+ int cx = cx1/2, cy = cy1/2 + ch/2;
+ int ow = ox2 - ox2, oh = oy2 - oy1;
BC_WindowBase *window = canvas->get_canvas();
window->set_color(BLACK);
window->clear_box(0,0, window->get_w(),window->get_h());
- window->draw_vframe(&vlt, lx,ly, w2,h2, 0,0,vlt.get_w(),vlt.get_h());
- window->draw_vframe(&vrt, rx,ry, w2,h2, 0,0,vrt.get_w(),vrt.get_h());
+ window->draw_vframe(&vlt, cx,cy, cdx,cdy, ox1,oy1, ow,oh); cx += cw;
+ window->draw_vframe(&vrt, cx,cy, cdx,cdy, ox1,oy1, ow,oh);
window->flash(1);
mwindow->cwindow->gui->unlock_window();
break; }
*percentage = 0;
*position = 0;
- if(!current->autos->track->record) return 1;
+ if(!current->autos->track->is_armed()) return 1;
double view_start;
double unit_start;
double view_end;
#define UPDATE_DRAG_HEAD(do_clamp) \
int result = 0, center_pixel; \
- if(!current->autos->track->record) return 0; \
+ if(!current->autos->track->is_armed()) return 0; \
double view_start, unit_start, view_end, unit_end; \
double yscale, zoom_sample, zoom_units; \
\
int result = 0;
for( Track *track=mwindow->edl->tracks->first; track && !result; track=track->next) {
+ if( track->is_hidden() ) continue;
for( Edit *edit=track->edits->first; edit && !result; edit=edit->next ) {
int64_t edit_x, edit_y, edit_w, edit_h;
edit_dimensions(edit, edit_x, edit_y, edit_w, edit_h);
update_overlay = 1;
}
}
- else if( result < 0 ) {
+ else if( result < 0 && !edit_result->silence() ) {
mwindow->undo->update_undo_before();
if( !shift_down() ) {
if( handle_result == 0 )
if( handle_result == 1 ) edit_edge += edit_result->length;
double edge_position = edit_result->track->from_units(edit_edge);
for( Track *track=mwindow->edl->tracks->first; track!=0; track=track->next ) {
+ if( track->is_hidden() ) continue;
int64_t track_position = track->to_units(edge_position, 1);
Edit *left_edit = track->edits->editof(track_position, PLAY_FORWARD, 0);
if( left_edit ) {
for(Track *track = mwindow->edl->tracks->first;
track && !result;
track = track->next) {
+ if( track->is_hidden() ) continue;
for(int i = 0; i < track->plugin_set.total && !result; i++) {
PluginSet *plugin_set = track->plugin_set.values[i];
for(Plugin *plugin = (Plugin*)plugin_set->first;
int result = 0;
for(Track *track = mwindow->edl->tracks->first; track && !result; track = track->next) {
+ if( track->is_hidden() ) continue;
for(Edit *edit = track->edits->first; edit && !result; edit = edit->next) {
int64_t edit_x, edit_y, edit_w, edit_h;
edit_dimensions(edit, edit_x, edit_y, edit_w, edit_h);
if( button_press && get_buttonpress() == LEFT_BUTTON ) {
if( get_double_click() ) {
mwindow->edl->tracks->clear_selected_edits();
- mwindow->edl->tracks->select_affected_edits(
- edit->track->from_units(edit->startproject),
- edit->track, 1);
+ edit->select_affected_edits(1, -1);
double start = edit->track->from_units(edit->startproject);
start = mwindow->edl->align_to_frame(start, 0);
mwindow->edl->local_session->set_selectionstart(start);
update_cursor = -1;
}
}
- else if( drag_start && track->record ) {
+ else if( drag_start && track->is_armed() ) {
mwindow->session->drag_edit = edit;
mwindow->session->drag_origin_x = cursor_x;
mwindow->session->drag_origin_y = cursor_y;
edit->set_selected(1);
}
else
- mwindow->edl->tracks->select_affected_edits(
- edit->track->from_units(edit->startproject),
- edit->track, 1);
+ edit->select_affected_edits(1, -1);
drag_start = 1;
}
// Construct list of all affected edits
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 intersects = 0;
Track *src = group->tracks->first;
for( Track *track=first_track; track && src; track=track->next ) {
- if( !track->record ) continue;
+ if( !track->is_armed() ) 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( edit_intersects(track, src_edit, pos) ) return 0;
+ if( !intersects && edit_intersects(track, src_edit, pos) )
+ intersects = 1;
}
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 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;
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;
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;
}
else
// Move plugin
- if( drag_start && plugin->track->record && !plugin->silence() ) {
+ if( drag_start && plugin->track->is_armed() && !plugin->silence() ) {
if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
if( plugin->track->data_type == TRACK_AUDIO )
mwindow->session->current_operation = DRAG_AEFFECT_COPY;
for( Track *track = mwindow->edl->tracks->first; track && !result; track = track->next ) {
+ if( track->is_hidden() ) continue;
if( !track->show_transitions() ) continue;
for( Edit *edit = track->edits->first; edit; edit = edit->next ) {