CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int log_increment = 0)
- : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, 100, 3)
+ : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, 70, 3)
{
this->gui = gui;
set_log_floatincrement(log_increment);
}
CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value)
- : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 100, 3)
+ : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 70, 3)
{
this->gui = gui;
}
for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
memset(submask->name, 0, sizeof(submask->name));
- strncpy(submask->name, get_text(), sizeof(submask->name));
+ strncpy(submask->name, get_text(), sizeof(submask->name)-1);
current = current == (MaskAuto*)autos->default_auto ?
(MaskAuto*)autos->first : (MaskAuto*)NEXT;
}
mask_items.remove_all_objects();
int sz = !keyframe ? 0 : keyframe->masks.size();
for( int i=0; i<SUBMASKS; ++i ) {
- char text[BCSTRLEN];
+ char text[BCSTRLEN]; memset(text, 0, sizeof(text));
if( i < sz ) {
SubMask *sub_mask = keyframe->masks.get(i);
- strncpy(text, sub_mask->name, sizeof(text));
+ strncpy(text, sub_mask->name, sizeof(text)-1);
}
else
sprintf(text, "%d", i);
}
CWindowMaskUnclear::CWindowMaskUnclear(MWindow *mwindow,
- CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Enable"))
+ CWindowMaskGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskGUI *gui, int x, int y)
: BC_TumbleTextBox(gui,
(int64_t)mwindow->cwindow->gui->affected_point,
- (int64_t)0, INT64_MAX, x, y, 100)
+ (int64_t)0, INT64_MAX, x, y, 70)
{
this->mwindow = mwindow;
this->gui = gui;
return 1;
}
+int CWindowMaskFocus::calculate_w(CWindowMaskGUI *gui)
+{
+ int w, h;
+ calculate_extents(gui, &w, &h, _("Focus"));
+ return w;
+}
+
+CWindowMaskScaleXY::CWindowMaskScaleXY(MWindow *mwindow, CWindowMaskGUI *gui,
+ int x, int y, VFrame **data, int v, int id, const char *tip)
+ : BC_Toggle(x, y, data, v)
+{
+ this->id = id;
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_tooltip(tip);
+}
+
+CWindowMaskScaleXY::~CWindowMaskScaleXY()
+{
+}
+
+int CWindowMaskScaleXY::handle_event()
+{
+ gui->scale_mode = id;
+ gui->mask_scale_x->update(id == 0);
+ gui->mask_scale_y->update(id == 1);
+ gui->mask_scale_xy->update(id == 2);
+ return 1;
+}
+
CWindowMaskHelp::CWindowMaskHelp(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
: BC_CheckBox(x, y, 0, _("Help"))
{
CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
: CWindowToolGUI(mwindow, thread,
- _(PROGRAM_NAME ": Mask"), 430, 700)
+ _(PROGRAM_NAME ": Mask"), 440, 700)
{
this->mwindow = mwindow;
this->thread = thread;
fade = 0;
feather = 0;
focused = 0;
+ scale_mode = 2;
markers = 1;
boundary = 1;
preset_dialog = 0;
void CWindowMaskGUI::create_objects()
{
- int x = 10, y = 10, margin = mwindow->theme->widget_border;
+ Theme *theme = mwindow->theme;
+ int x = 10, y = 10, margin = theme->widget_border, t[SUBMASKS];
int clr_w = CWindowMaskClrMask::calculate_w(mwindow);
int clr_x = get_w()-x - clr_w;
- int del_w = CWindowMaskDelMask::calculate_w(this,_("Delete"));
- int del_x = clr_x-2*margin - del_w;
lock_window("CWindowMaskGUI::create_objects");
BC_TitleBar *title_bar;
y += title_bar->get_h() + margin;
BC_Title *title;
add_subwindow(title = new BC_Title(x,y, _("Track:")));
- int x1 = x + 90;
+ int x1 = x + 90, ww = clr_x-2*margin - x1;
+ for( int i=0,n=sizeof(t)/sizeof(t[0]); i<n; ++i ) t[i] = x1+(i*ww)/n;
+ int del_x = t[5];
Track *track = mwindow->cwindow->calculate_affected_track();
const char *text = track ? track->title : "";
mwindow->cwindow->mask_track_id = track ? track->get_id() : -1;
int x2 = x1 + mask_on_track->get_w();
add_subwindow(mask_track_tumbler = new CWindowMaskTrackTumbler(mwindow, this, x2, y));
mwindow->edl->local_session->solo_track_id = -1;
- x2 = del_x + (del_w - CWindowMaskSoloTrack::calculate_w(this)) / 2;
- add_subwindow(mask_solo_track = new CWindowMaskSoloTrack(mwindow, this, x2, y, 0));
+ add_subwindow(mask_solo_track = new CWindowMaskSoloTrack(mwindow, this, del_x, y, 0));
y += mask_on_track->get_h() + margin;
add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks")));
y += title_bar->get_h() + margin;
add_subwindow(mask_clr = new CWindowMaskClrMask(mwindow, this, clr_x, y));
add_subwindow(mask_del = new CWindowMaskDelMask(mwindow, this, del_x, y));
y += mask_name->get_h() + 2*margin;
- add_subwindow(title = new BC_Title(x, y, _("Presets:")));
- add_subwindow(mask_shape = new CWindowMaskShape(mwindow, this));
- mask_shape->create_objects();
- add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, x2=x1, y, 80));
- x2 += mask_load->get_w() + 2*margin;
- add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, x2, y, 80));
- x2 += mask_save->get_w() + 2*margin;
- add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, x2, y, 80));
- y += mask_load->get_h() + 2*margin;
BC_Bar *bar;
- add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
- y += bar->get_h() + 2*margin;
+// add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
+// y += bar->get_h() + 2*margin;
add_subwindow(title = new BC_Title(x, y, _("Select:")));
int bw = 0, bh = 0;
BC_CheckBox::calculate_extents(this, &bw, &bh);
- int bdx = bw + 2*margin;
- x2 = x1;
- for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+ for( int i=0; i<SUBMASKS; ++i ) {
int v = i == mwindow->edl->session->cwindow_mask ? 1 : 0;
- mask_buttons[i] = new CWindowMaskButton(mwindow, this, x2, y, i, v);
+ mask_buttons[i] = new CWindowMaskButton(mwindow, this, t[i], y, i, v);
add_subwindow(mask_buttons[i]);
}
- x2 += margin;
- add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, x2, y));
+ add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, clr_x, y));
y += bh + margin;
- x2 = x1;
- for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+ for( int i=0; i<SUBMASKS; ++i ) {
char text[BCSTRLEN]; sprintf(text, "%d", i);
int tx = (bw - get_text_width(MEDIUMFONT, text)) / 2;
- mask_blabels[i] = new BC_Title(x2+tx, y, text);
+ mask_blabels[i] = new BC_Title(t[i]+tx, y, text);
add_subwindow(mask_blabels[i]);
}
y += mask_blabels[0]->get_h() + margin;
- add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*margin));
- x2 = x1;
- for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
- mask_enables[i] = new CWindowMaskEnable(mwindow, this, x2, y, i, 1);
+ add_subwindow(title = new BC_Title(x, y, _("Enable:")));
+ for( int i=0; i<SUBMASKS; ++i ) {
+ mask_enables[i] = new CWindowMaskEnable(mwindow, this, t[i], y, i, 1);
add_subwindow(mask_enables[i]);
}
+ add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, clr_x, y));
y += mask_enables[0]->get_h() + 2*margin;
- add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Presets shapes")));
y += title_bar->get_h() + margin;
+ add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this,
+ "mask_prst_sqr_images", MASK_SHAPE_SQUARE, t[0], y, _("Square")));
+ add_subwindow(mask_shape_crc = new CWindowMaskShape(mwindow, this,
+ "mask_prst_crc_images", MASK_SHAPE_CIRCLE, t[1], y, _("Circle")));
+ add_subwindow(mask_shape_tri = new CWindowMaskShape(mwindow, this,
+ "mask_prst_tri_images", MASK_SHAPE_TRIANGLE, t[2], y, _("Triangle")));
+ add_subwindow(mask_shape_ovl = new CWindowMaskShape(mwindow, this,
+ "mask_prst_ovl_images", MASK_SHAPE_OVAL, t[3], y, _("Oval")));
+ add_subwindow(mask_load_list = new CWindowMaskLoadList(mwindow, this));
+ add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, t[5], y, 80));
+ add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, t[6], y, 80));
+ add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, t[7], y, 80));
+ y += mask_load->get_h() + 2*margin;
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Position & Scale")));
+ y += title_bar->get_h() + 2*margin;
+ add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, t[0], y, 80));
+ add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, t[1], y, 80));
+
+ add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
+ t[5], y, theme->get_image_set("mask_scale_x"), 0, 0, _("xlate/scale x")));
+ add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this,
+ t[6], y, theme->get_image_set("mask_scale_y"), 0, 1, _("xlate/scale y")));
+ add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
+ t[7], y, theme->get_image_set("mask_scale_xy"), 1, 2, _("xlate/scale xy")));
+ y += mask_center->get_h() + 2*margin;
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+ y += title_bar->get_h() + 2*margin;
add_subwindow(title = new BC_Title(x, y, _("Fade:")));
fade = new CWindowMaskFade(mwindow, this, x1, y);
add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Mask Points")));
y += title_bar->get_h() + margin;
- x1 = x + 60;
add_subwindow(title = new BC_Title(x, y, _("Point:")));
- active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
+ active_point = new CWindowMaskAffectedPoint(mwindow, this, t[0], y);
active_point->create_objects();
- int x3 = x1 + active_point->get_w() + 4*margin;
// typ=0, this mask, this point
add_subwindow(mask_pnt_linear = new CWindowMaskSmoothButton(mwindow, this,
- _("linear point"), 0, 0, x3, y, "mask_pnt_linear_images"));
- int x4 = x3 + mask_pnt_linear->get_w() + 2*margin;
+ _("linear point"), 0, 0, t[3], y, "mask_pnt_linear_images"));
add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this,
- _("smooth point"), 0, 1, x4, y, "mask_pnt_smooth_images"));
+ _("smooth point"), 0, 1, t[4], y, "mask_pnt_smooth_images"));
add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y));
y += active_point->get_h() + margin;
add_subwindow(title = new BC_Title(x, y, "X:"));
- this->x = new CWindowCoord(this, x1, y, (float)0.0);
+ this->x = new CWindowCoord(this, t[0], y, (float)0.0);
this->x->create_objects();
// typ>0, this mask, all points
add_subwindow(mask_crv_linear = new CWindowMaskSmoothButton(mwindow, this,
- _("linear curve"), 1, 0, x3, y, "mask_crv_linear_images"));
+ _("linear curve"), 1, 0, t[3], y, "mask_crv_linear_images"));
add_subwindow(mask_crv_smooth = new CWindowMaskSmoothButton(mwindow, this,
- _("smooth curve"), 1, 1, x4, y, "mask_crv_smooth_images"));
+ _("smooth curve"), 1, 1, t[4], y, "mask_crv_smooth_images"));
add_subwindow(draw_markers = new CWindowMaskDrawMarkers(mwindow, this, del_x, y));
y += this->x->get_h() + margin;
add_subwindow(title = new BC_Title(x, y, "Y:"));
this->y->create_objects();
// typ<0, all masks, all points
add_subwindow(mask_all_linear = new CWindowMaskSmoothButton(mwindow, this,
- _("linear all"), -1, 0, x3, y, "mask_all_linear_images"));
+ _("linear all"), -1, 0, t[3], y, "mask_all_linear_images"));
add_subwindow(mask_all_smooth = new CWindowMaskSmoothButton(mwindow, this,
- _("smooth all"), -1, 1, x4, y, "mask_all_smooth_images"));
+ _("smooth all"), -1, 1, t[4], y, "mask_all_smooth_images"));
add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y));
y += this->y->get_h() + 2*margin;
add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Pivot Point")));
float cy = mwindow->edl->session->output_h / 2.f;
focus_y = new CWindowCoord(this, x1, y, cy);
focus_y->create_objects();
- add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, x2=x4, y, 80));
- x2 += mask_center->get_w() + 2*margin;
- add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, x2, y, 80));
- y += focus_x->get_h() + 2*margin;
+ y += focus_y->get_h() + 2*margin;
add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
y += bar->get_h() + margin;
add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y));
for( int j=typ<0? 0 : k; j<n; ++j ) {
if( !mask_enables[j]->get_value() ) continue;
SubMask *sub_mask = keyframe->get_submask(j);
- ArrayList<MaskPoint*> &points = sub_mask->points;
+ MaskPoints &points = sub_mask->points;
int psz = points.size();
if( psz < 3 ) continue;
int l = mwindow->cwindow->gui->affected_point;
keyframe = &temp_keyframe;
#endif
SubMask *sub_mask = keyframe->get_submask(k);
- ArrayList<MaskPoint*> &points = sub_mask->points;
+ MaskPoints &points = sub_mask->points;
int psz = points.size();
if( psz > 0 ) {
float cx = 0, cy = 0;
keyframe = &temp_keyframe;
#endif
SubMask *sub_mask = keyframe->get_submask(k);
- ArrayList<MaskPoint*> &points = sub_mask->points;
+ MaskPoints &points = sub_mask->points;
int psz = points.size();
float cx = 0, cy = 0;
double dr = 0;
}
+CWindowMaskLoadList::CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui)
+ : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+{
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_use_button(0);
+}
+
+CWindowMaskLoadList::~CWindowMaskLoadList()
+{
+}
+
+
+int CWindowMaskLoadList::handle_event()
+{
+ MaskAutos *autos;
+ MaskAuto *keyframe;
+ Track *track;
+ MaskPoint *point;
+ SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+ int create_it = 0;
+#else
+ int create_it = 1;
+#endif
+
+ mwindow->undo->update_undo_before(_("mask shape"), this);
+
+// Get existing keyframe
+ gui->get_keyframe(track, autos, keyframe,
+ mask, point, create_it);
+ CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0);
+ if( track && item ) {
+#ifdef USE_KEYFRAME_SPANNING
+ MaskAuto temp_keyframe(mwindow->edl, autos);
+ temp_keyframe.copy_data(keyframe);
+ keyframe = &temp_keyframe;
+ mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+ ArrayList<SubMask *> masks;
+ gui->load_masks(masks);
+ mask->copy_from(*masks[item->id], 0);
+ masks.remove_all_objects();
+#ifdef USE_KEYFRAME_SPANNING
+ autos->update_parameter(keyframe);
+#endif
+ gui->update();
+ gui->update_preview(1);
+ }
+ mwindow->undo->update_undo_after(_("mask shape"), LOAD_AUTOMATION);
+ return 1;
+}
+
+void CWindowMaskLoadList::create_objects()
+{
+ shape_items.remove_all_objects();
+ ArrayList<SubMask *> masks;
+ gui->load_masks(masks);
+ for( int i=0; i<masks.size(); ++i )
+ shape_items.append(new CWindowMaskItem(masks[i]->name, i));
+ masks.remove_all_objects();
+ update(&shape_items, 0, 0, 1);
+}
+
CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Load"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_load_images"))
{
this->mwindow = mwindow;
this->gui = gui;
int CWindowMaskLoad::handle_event()
{
- gui->mask_shape->create_objects();
+ gui->mask_load_list->create_objects();
int px, py;
get_abs_cursor(px, py);
- return gui->mask_shape->activate(px, py, 120,160);
+ return gui->mask_load_list->activate(px, py, 120,160);
}
CWindowMaskSave::CWindowMaskSave(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Save"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_save_images"))
{
this->mwindow = mwindow;
this->gui = gui;
pgui->preset_dialog->gui->load_masks(masks);
for( int i=0; i<masks.size(); ++i ) {
char text[BCSTRLEN]; memset(text, 0, sizeof(text));
- strncpy(text, masks[i]->name, sizeof(text-1));
+ strncpy(text, masks[i]->name, sizeof(text)-1);
mask_items.append(new CWindowMaskItem(text));
}
masks.remove_all_objects();
CWindowMaskDelete::CWindowMaskDelete(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Del"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_trsh_images"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskCenter::CWindowMaskCenter(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Center"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_cen_images"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskNormal::CWindowMaskNormal(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Normal"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_nrm_images"))
{
this->mwindow = mwindow;
this->gui = gui;
}
-CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui)
- : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui,
+ const char *images, int shape, int x, int y, const char *tip)
+ : BC_Button(x, y, mwindow->theme->get_image_set(images))
{
this->mwindow = mwindow;
this->gui = gui;
- set_use_button(0);
+ this->shape = shape;
+ set_tooltip(tip);
}
CWindowMaskShape::~CWindowMaskShape()
double c = 4*(sqrt(2.)-1)/3; // bezier aprox circle
float r2 = r / 2.f, rc = r*c, r4 = r / 4.f;
MaskPoint *pt = 0;
- ArrayList<MaskPoint*> &points = sub_mask->points;
+ MaskPoints &points = sub_mask->points;
points.remove_all_objects();
switch( i ) {
- case 0: // square
+ case MASK_SHAPE_SQUARE:
points.append(pt = new MaskPoint());
pt->x = cx - r; pt->y = cy - r;
points.append(pt = new MaskPoint());
points.append(pt = new MaskPoint());
pt->x = cx - r; pt->y = cy + r;
break;
- case 1: // circle
+ case MASK_SHAPE_CIRCLE:
points.append(pt = new MaskPoint());
pt->x = cx - r; pt->y = cy - r;
pt->control_x1 = -rc; pt->control_y1 = rc;
pt->control_x1 = rc; pt->control_y1 = rc;
pt->control_x2 = -rc; pt->control_y2 = -rc;
break;
- case 2: // triangle
+ case MASK_SHAPE_TRIANGLE:
points.append(pt = new MaskPoint());
pt->x = cx + 0; pt->y = cy - r*(sqrt(3.)-1.);
points.append(pt = new MaskPoint());
points.append(pt = new MaskPoint());
pt->x = cx - r; pt->y = cy + r;
break;
- case 3: // oval
+ case MASK_SHAPE_OVAL:
points.append(pt = new MaskPoint());
pt->x = cx - r; pt->y = cy - r2;
pt->control_x1 = -r2; pt->control_y1 = r4;
}
}
-void CWindowMaskShape::load_shape(int i, SubMask *sub_mask)
-{
- ArrayList<SubMask *> masks;
- gui->load_masks(masks);
- sub_mask->copy_from(*masks[i], 0);
- masks.remove_all_objects();
-}
-
int CWindowMaskShape::handle_event()
{
MaskAutos *autos;
// Get existing keyframe
gui->get_keyframe(track, autos, keyframe,
mask, point, create_it);
- int k = get_selection_number(0, 0);
- if( track && k >= 0 ) {
+ if( track ) {
#ifdef USE_KEYFRAME_SPANNING
MaskAuto temp_keyframe(mwindow->edl, autos);
temp_keyframe.copy_data(keyframe);
mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
#endif
if( mask ) {
- if( k < 4 )
- builtin_shape(k, mask);
- else
- load_shape(k-4, mask);
+ builtin_shape(shape, mask);
#ifdef USE_KEYFRAME_SPANNING
autos->update_parameter(keyframe);
#endif
return 1;
}
-void CWindowMaskShape::create_objects()
-{
- shape_items.remove_all_objects();
- shape_items.append(new BC_ListBoxItem(_("square")));
- shape_items.append(new BC_ListBoxItem(_("circle")));
- shape_items.append(new BC_ListBoxItem(_("triangle")));
- shape_items.append(new BC_ListBoxItem(_("oval")));
- ArrayList<SubMask *> masks;
- gui->load_masks(masks);
- for( int i=0; i<masks.size(); ++i )
- shape_items.append(new BC_ListBoxItem(masks[i]->name));
- masks.remove_all_objects();
- update(&shape_items, 0, 0, 1);
-}
-
void CWindowMaskGUI::load_masks(ArrayList<SubMask *> &masks)
{
char path[BCTEXTLEN];
projects / goodguy / cinelerra.git / blobdiff