X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=3a0d72b8e6a25fbe1c98f2e23f424be1c7b340db;hp=d985f3df4f97150766a7f18551c57e133534ece1;hb=6d8835a537ca709e122226506548de0d4942aa32;hpb=3f801b05e0de577b00e98019b099ed38d66b9550 diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index d985f3df..3a0d72b8 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -353,14 +353,14 @@ void CWindowToolGUI::draw_preview(int changed_edl) 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; } @@ -1633,7 +1633,7 @@ int CWindowMaskName::handle_event() 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; } @@ -1649,10 +1649,10 @@ void CWindowMaskName::update_items(MaskAuto *keyframe) mask_items.remove_all_objects(); int sz = !keyframe ? 0 : keyframe->masks.size(); for( int i=0; imasks.get(i); - strncpy(text, sub_mask->name, sizeof(text)); + strncpy(text, sub_mask->name, sizeof(text)-1); } else sprintf(text, "%d", i); @@ -1749,8 +1749,8 @@ int CWindowMaskEnable::handle_event() } 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; @@ -1937,7 +1937,7 @@ CWindowMaskAffectedPoint::CWindowMaskAffectedPoint(MWindow *mwindow, 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; @@ -1994,6 +1994,36 @@ int CWindowMaskFocus::handle_event() 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")) { @@ -2461,7 +2491,7 @@ int CWindowMaskGangFeather::handle_event() 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; @@ -2469,6 +2499,7 @@ CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread) fade = 0; feather = 0; focused = 0; + scale_mode = 2; markers = 1; boundary = 1; preset_dialog = 0; @@ -2486,11 +2517,10 @@ CWindowMaskGUI::~CWindowMaskGUI() 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; @@ -2498,7 +2528,9 @@ void CWindowMaskGUI::create_objects() 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]); icwindow->calculate_affected_track(); const char *text = track ? track->title : ""; mwindow->cwindow->mask_track_id = track ? track->get_id() : -1; @@ -2508,8 +2540,7 @@ void CWindowMaskGUI::create_objects() 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; @@ -2520,49 +2551,63 @@ void CWindowMaskGUI::create_objects() 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; iedl->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; iget_h() + margin; - add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*margin)); - x2 = x1; - for( int i=0; iget_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); @@ -2583,27 +2628,24 @@ void CWindowMaskGUI::create_objects() 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:")); @@ -2611,9 +2653,9 @@ void CWindowMaskGUI::create_objects() 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"))); @@ -2630,10 +2672,7 @@ void CWindowMaskGUI::create_objects() 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)); @@ -2854,7 +2893,7 @@ int CWindowMaskGUI::smooth_mask(int typ, int on) for( int j=typ<0? 0 : k; jget_value() ) continue; SubMask *sub_mask = keyframe->get_submask(j); - ArrayList &points = sub_mask->points; + MaskPoints &points = sub_mask->points; int psz = points.size(); if( psz < 3 ) continue; int l = mwindow->cwindow->gui->affected_point; @@ -2949,7 +2988,7 @@ int CWindowMaskGUI::center_mask() keyframe = &temp_keyframe; #endif SubMask *sub_mask = keyframe->get_submask(k); - ArrayList &points = sub_mask->points; + MaskPoints &points = sub_mask->points; int psz = points.size(); if( psz > 0 ) { float cx = 0, cy = 0; @@ -2998,7 +3037,7 @@ int CWindowMaskGUI::normal_mask() keyframe = &temp_keyframe; #endif SubMask *sub_mask = keyframe->get_submask(k); - ArrayList &points = sub_mask->points; + MaskPoints &points = sub_mask->points; int psz = points.size(); float cx = 0, cy = 0; double dr = 0; @@ -3039,9 +3078,73 @@ int CWindowMaskGUI::normal_mask() } +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 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 masks; + gui->load_masks(masks); + for( int i=0; iname, 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; @@ -3050,16 +3153,16 @@ CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow, 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; @@ -3185,7 +3288,7 @@ void CWindowMaskPresetText::update_items() pgui->preset_dialog->gui->load_masks(masks); for( int i=0; iname, sizeof(text-1)); + strncpy(text, masks[i]->name, sizeof(text)-1); mask_items.append(new CWindowMaskItem(text)); } masks.remove_all_objects(); @@ -3195,7 +3298,7 @@ void CWindowMaskPresetText::update_items() 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; @@ -3215,7 +3318,7 @@ int CWindowMaskDelete::handle_event() 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; @@ -3230,7 +3333,7 @@ int CWindowMaskCenter::handle_event() 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; @@ -3243,12 +3346,14 @@ int CWindowMaskNormal::handle_event() } -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() @@ -3264,10 +3369,10 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) 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 &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()); @@ -3277,7 +3382,7 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) 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; @@ -3295,7 +3400,7 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) 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()); @@ -3303,7 +3408,7 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) 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; @@ -3324,14 +3429,6 @@ void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask) } } -void CWindowMaskShape::load_shape(int i, SubMask *sub_mask) -{ - ArrayList masks; - gui->load_masks(masks); - sub_mask->copy_from(*masks[i], 0); - masks.remove_all_objects(); -} - int CWindowMaskShape::handle_event() { MaskAutos *autos; @@ -3350,8 +3447,7 @@ int CWindowMaskShape::handle_event() // 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); @@ -3359,10 +3455,7 @@ int CWindowMaskShape::handle_event() 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 @@ -3374,21 +3467,6 @@ int CWindowMaskShape::handle_event() 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 masks; - gui->load_masks(masks); - for( int i=0; iname)); - masks.remove_all_objects(); - update(&shape_items, 0, 0, 1); -} - void CWindowMaskGUI::load_masks(ArrayList &masks) { char path[BCTEXTLEN];