add preset mask shapes, add ctr/nrml btns, new igor icons, enables apply to mask...
authorGood Guy <good1.2guy@gmail.com>
Mon, 8 Jul 2019 20:37:14 +0000 (14:37 -0600)
committerGood Guy <good1.2guy@gmail.com>
Mon, 8 Jul 2019 20:37:14 +0000 (14:37 -0600)
107 files changed:
cinelerra-5.1/cinelerra/cwindowgui.C
cinelerra-5.1/cinelerra/cwindowtool.C
cinelerra-5.1/cinelerra/cwindowtool.h
cinelerra-5.1/cinelerra/cwindowtool.inc
cinelerra-5.1/cinelerra/maskauto.C
cinelerra-5.1/cinelerra/maskauto.h
cinelerra-5.1/cinelerra/mwindow.inc
cinelerra-5.1/doc/shortcuts.html
cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png
cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png
cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png
cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png
cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png
cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png
cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png
cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png
cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png
cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png
cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png
cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png
cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png
cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png
cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png

index 97ca8e6..5adb0f2 100644 (file)
@@ -2086,6 +2086,7 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
                                int k = mwindow->edl->session->cwindow_mask;
                                int n = gang ? keyframe->masks.size() : k+1;
                                for( int j=gang? 0 : k; j<n; ++j ) {
+                                       if( !mask_gui->mask_enables[j]->get_value() ) continue;
                                        SubMask *sub_mask = keyframe->get_submask(j);
                                        if( !sub_mask ) continue;
                                        ArrayList<MaskPoint*> &points = sub_mask->points;
@@ -2137,9 +2138,10 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
                                int k = mwindow->edl->session->cwindow_mask;
                                int n = gang ? keyframe->masks.size() : k+1;
                                for( int j=gang? 0 : k; j<n; ++j ) {
+                                       if( !mask_gui->mask_enables[j]->get_value() ) continue;
                                        SubMask *sub_mask = keyframe->get_submask(j);
-                                       ArrayList<MaskPoint*> &points = sub_mask->points;
                                        if( !sub_mask ) continue;
+                                       ArrayList<MaskPoint*> &points = sub_mask->points;
                                        for( int i=0; i<points.size(); ++i ) {
                                                MaskPoint *point = points[i];
                                                float px = point->x - gui->x_origin;
index dfd8bdd..d985f3d 100644 (file)
@@ -33,6 +33,8 @@
 #include "cwindowtool.h"
 #include "edl.h"
 #include "edlsession.h"
+#include "file.h"
+#include "filexml.h"
 #include "floatauto.h"
 #include "floatautos.h"
 #include "keys.h"
@@ -707,10 +709,10 @@ void CWindowCurveToggle::check_toggle_state(FloatAuto *x, FloatAuto *y, FloatAut
 // three automation lines have the same curve mode.
 // For mixed states the toggle stays off.
        set_value( x->curve_mode == this->cfg.mode &&
-                  y->curve_mode == this->cfg.mode &&
-                  z->curve_mode == this->cfg.mode
-                ,true // redraw to show new state
-                );
+                  y->curve_mode == this->cfg.mode &&
+                  z->curve_mode == this->cfg.mode
+                  ,true // redraw to show new state
+               );
 }
 
 int CWindowCurveToggle::handle_event()
@@ -1636,7 +1638,7 @@ int CWindowMaskName::handle_event()
                                (MaskAuto*)autos->first : (MaskAuto*)NEXT;
                }
 #endif
-               gui->update();
+               gui->update();
                gui->update_preview();
        }
        return 1;
@@ -1833,7 +1835,7 @@ int CWindowMaskDelMask::handle_event()
 #else
                for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
                        SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-                       submask->points.clear();
+                       submask->points.remove_all_objects();
                        current = current == (MaskAuto*)autos->default_auto ?
                                (MaskAuto*)autos->first : (MaskAuto*)NEXT;
                }
@@ -1892,11 +1894,12 @@ int CWindowMaskDelPoint::handle_event()
 // Commit change to span of keyframes
                ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
 #else
+               total_points = 0;
                MaskAuto *current = (MaskAuto*)autos->default_auto;
                while( current ) {
                        SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
                        int i = mwindow->cwindow->gui->affected_point;
-                       for( ; i<submask->points.total-1; ++i ) {
+                       for( ; i<submask->points.total-1; ++i )
                                *submask->points.values[i] = *submask->points.values[i+1];
                        if( submask->points.total > 0 ) {
                                point = submask->points.values[submask->points.total-1];
@@ -1913,7 +1916,7 @@ int CWindowMaskDelPoint::handle_event()
 
                gui->update();
                gui->update_preview();
-               mwindow->undo->update_undo_after(_("mask delete"), LOAD_AUTOMATION);
+               mwindow->undo->update_undo_after(_("point delete"), LOAD_AUTOMATION);
        }
 
        return 1;
@@ -2098,6 +2101,7 @@ int CWindowMaskFeather::update_value(float v)
                int k = mwindow->edl->session->cwindow_mask;
                int n = gang ? keyframe->masks.size() : k+1;
                for( int i=gang? 0 : k; i<n; ++i ) {
+                       if( !gui->mask_enables[i]->get_value() ) continue;
                        SubMask *sub_mask = keyframe->get_submask(i);
                        float feather = sub_mask->feather + change;
                        bclamp(feather, -FEATHER_MAX, FEATHER_MAX);
@@ -2212,6 +2216,7 @@ int CWindowMaskFade::update_value(float v)
                int k = mwindow->edl->session->cwindow_mask;
                int n = gang ? keyframe->masks.size() : k+1;
                for( int i=gang? 0 : k; i<n; ++i ) {
+                       if( !gui->mask_enables[i]->get_value() ) continue;
                        SubMask *sub_mask = keyframe->get_submask(i);
                        float fader = sub_mask->fader + change;
                        bclamp(fader, -100.f, 100.f);
@@ -2284,9 +2289,9 @@ CWindowMaskGangFader::CWindowMaskGangFader(MWindow *mwindow,
                CWindowMaskGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
 {
-        this->mwindow = mwindow;
-        this->gui = gui;
-        set_tooltip(_("Gang fader"));
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("Gang fader"));
 }
 
 CWindowMaskGangFader::~CWindowMaskGangFader()
@@ -2302,9 +2307,9 @@ CWindowMaskGangFocus::CWindowMaskGangFocus(MWindow *mwindow,
                CWindowMaskGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
 {
-        this->mwindow = mwindow;
-        this->gui = gui;
-        set_tooltip(_("Gang rotate/scale/translate"));
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("Gang rotate/scale/translate"));
 }
 
 CWindowMaskGangFocus::~CWindowMaskGangFocus()
@@ -2440,9 +2445,9 @@ CWindowMaskGangFeather::CWindowMaskGangFeather(MWindow *mwindow,
                CWindowMaskGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
 {
-        this->mwindow = mwindow;
-        this->gui = gui;
-        set_tooltip(_("Gang feather"));
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("Gang feather"));
 }
 
 CWindowMaskGangFeather::~CWindowMaskGangFeather()
@@ -2456,7 +2461,7 @@ int CWindowMaskGangFeather::handle_event()
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-       _(PROGRAM_NAME ": Mask"), 430, 680)
+       _(PROGRAM_NAME ": Mask"), 430, 700)
 {
        this->mwindow = mwindow;
        this->thread = thread;
@@ -2466,6 +2471,7 @@ CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
        focused = 0;
        markers = 1;
        boundary = 1;
+       preset_dialog = 0;
 }
 CWindowMaskGUI::~CWindowMaskGUI()
 {
@@ -2475,6 +2481,7 @@ CWindowMaskGUI::~CWindowMaskGUI()
        delete fade;
        delete feather;
        unlock_window();
+       delete preset_dialog;
 }
 
 void CWindowMaskGUI::create_objects()
@@ -2510,9 +2517,21 @@ void CWindowMaskGUI::create_objects()
        mask_name = new CWindowMaskName(mwindow, this, x1, y, "");
        mask_name->create_objects();
        mask_name->set_tooltip(_("Mask name"));
-       add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
-       add_subwindow(del_mask = new CWindowMaskDelMask(mwindow, this, del_x, y));
+       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(title = new BC_Title(x, y, _("Select:")));
        int bw = 0, bh = 0;
@@ -2535,7 +2554,7 @@ void CWindowMaskGUI::create_objects()
                add_subwindow(mask_blabels[i]);
        }
        y += mask_blabels[0]->get_h() + margin;
-       add_subwindow(unclr_mask = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*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);
@@ -2571,7 +2590,7 @@ void CWindowMaskGUI::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,
-               _("sharp point"), 0, 0, x3, y, "mask_pnt_linear_images"));
+               _("linear point"), 0, 0, x3, y, "mask_pnt_linear_images"));
        int x4  = x3 + mask_pnt_linear->get_w() + 2*margin;
        add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this,
                _("smooth point"), 0, 1, x4, y, "mask_pnt_smooth_images"));
@@ -2582,7 +2601,7 @@ void CWindowMaskGUI::create_objects()
        this->x->create_objects();
 // typ>0, this mask, all points
        add_subwindow(mask_crv_linear = new CWindowMaskSmoothButton(mwindow, this,
-               _("sharp curve"), 1, 0, x3, y, "mask_crv_linear_images"));
+               _("linear curve"), 1, 0, x3, y, "mask_crv_linear_images"));
        add_subwindow(mask_crv_smooth = new CWindowMaskSmoothButton(mwindow, this,
                _("smooth curve"), 1, 1, x4, y, "mask_crv_smooth_images"));
        add_subwindow(draw_markers = new CWindowMaskDrawMarkers(mwindow, this, del_x, y));
@@ -2592,7 +2611,7 @@ void CWindowMaskGUI::create_objects()
        this->y->create_objects();
 // typ<0, all masks, all points
        add_subwindow(mask_all_linear = new CWindowMaskSmoothButton(mwindow, this,
-               _("sharp all"), -1, 0, x3, y, "mask_all_linear_images"));
+               _("linear all"), -1, 0, x3, y, "mask_all_linear_images"));
        add_subwindow(mask_all_smooth = new CWindowMaskSmoothButton(mwindow, this,
                _("smooth all"), -1, 1, x4, y, "mask_all_smooth_images"));
        add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y));
@@ -2611,8 +2630,10 @@ 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;
-       BC_Bar *bar;
        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));
@@ -2621,7 +2642,7 @@ void CWindowMaskGUI::create_objects()
        add_subwindow(help = new CWindowMaskHelp(mwindow, this, del_x, y));
        y += this->disable_opengl_masking->get_h() + 2*margin;
        help_y = y;
-       add_subwindow(new BC_Bar(x, y, get_w()-2*x));
+       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, _(
                "Shift+LMB: move an end point\n"
@@ -2831,13 +2852,15 @@ int CWindowMaskGUI::smooth_mask(int typ, int on)
                int k = mwindow->edl->session->cwindow_mask;
                int n = typ>=0 ? k+1 : keyframe->masks.size();
                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;
                        int psz = points.size();
                        if( psz < 3 ) continue;
                        int l = mwindow->cwindow->gui->affected_point;
+                       if( l > psz ) l = psz;
                        int m = typ ? psz : l+1;
-                       for( int i=typ<0? 0 : l; i<m; ++i ) {
+                       for( int i=typ ? 0 : l; i<m; ++i ) {
                                int i0 = i-1, i1 = i+1;
                                if( i0 < 0 ) i0 = psz-1;
                                if( i1 >= psz ) i1 = 0;
@@ -2860,6 +2883,552 @@ int CWindowMaskGUI::smooth_mask(int typ, int on)
        return 1;
 }
 
+int CWindowMaskGUI::save_mask(const char *nm)
+{
+       int k = mwindow->edl->session->cwindow_mask;
+       MaskAutos *autos;
+       MaskAuto *keyframe;
+       Track *track;
+       MaskPoint *point;
+       SubMask *mask;
+       get_keyframe(track, autos, keyframe, mask, point, 0);
+       if( !track ) return 0;
+       SubMask *sub_mask = keyframe->get_submask(k);
+       ArrayList<SubMask *> masks;
+       load_masks(masks);
+       int i = masks.size();
+       while( --i >= 0 ) {
+               if( strcmp(masks[i]->name, nm) ) continue;
+               masks.remove_object_number(i);
+       }
+       mask = new SubMask(0, -1);
+       strncpy(mask->name, nm, sizeof(mask->name)-1);
+       mask->copy_from(*sub_mask, 0);
+       masks.append(mask);
+       save_masks(masks);
+       masks.remove_all_objects();
+       return 1;
+}
+
+int CWindowMaskGUI::del_mask(const char *nm)
+{
+       ArrayList<SubMask *> masks;
+       load_masks(masks);
+       int i = masks.size();
+       while( --i >= 0 ) {
+               if( strcmp(masks[i]->name, nm) ) continue;
+               masks.remove_object_number(i);
+       }
+       save_masks(masks);
+       masks.remove_all_objects();
+       return 1;
+}
+
+int CWindowMaskGUI::center_mask()
+{
+       int k = mwindow->edl->session->cwindow_mask;
+       MaskAutos *autos;
+       MaskAuto *keyframe;
+       Track *track;
+       MaskPoint *point;
+       SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+       int create_it = 0;
+#else
+       int create_it = 1;
+#endif
+       get_keyframe(track, autos, keyframe,
+                       mask, point, create_it);
+       if( !track ) return 0;
+       mwindow->undo->update_undo_before(_("mask center"), this);
+
+// Get existing keyframe
+#ifdef USE_KEYFRAME_SPANNING
+       MaskAuto temp_keyframe(mwindow->edl, autos);
+       temp_keyframe.copy_data(keyframe);
+       keyframe = &temp_keyframe;
+#endif
+       SubMask *sub_mask = keyframe->get_submask(k);
+       ArrayList<MaskPoint*> &points = sub_mask->points;
+       int psz = points.size();
+       if( psz > 0 ) {
+               float cx = 0, cy = 0;
+               for( int i=0; i<psz; ++i ) {
+                       MaskPoint *p  = points[i];
+                       cx += p->x;  cy += p->y;
+               }
+               cx /= psz;  cy /= psz;
+               cx -= mwindow->edl->session->output_w / 2.f;
+               cy -= mwindow->edl->session->output_h / 2.f;
+               for( int i=0; i<psz; ++i ) {
+                       MaskPoint *p  = points[i];
+                       p->x -= cx;  p->y -= cy;
+               }
+       }
+#ifdef USE_KEYFRAME_SPANNING
+       autos->update_parameter(keyframe);
+#endif
+       update_preview();
+       mwindow->undo->update_undo_after(_("mask center"), LOAD_AUTOMATION);
+       return 1;
+}
+
+int CWindowMaskGUI::normal_mask()
+{
+       int k = mwindow->edl->session->cwindow_mask;
+       MaskAutos *autos;
+       MaskAuto *keyframe;
+       Track *track;
+       MaskPoint *point;
+       SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+       int create_it = 0;
+#else
+       int create_it = 1;
+#endif
+// Get existing keyframe
+       get_keyframe(track, autos, keyframe,
+                       mask, point, create_it);
+       if( !track ) return 0;
+       mwindow->undo->update_undo_before(_("mask normal"), this);
+
+#ifdef USE_KEYFRAME_SPANNING
+       MaskAuto temp_keyframe(mwindow->edl, autos);
+       temp_keyframe.copy_data(keyframe);
+       keyframe = &temp_keyframe;
+#endif
+       SubMask *sub_mask = keyframe->get_submask(k);
+       ArrayList<MaskPoint*> &points = sub_mask->points;
+       int psz = points.size();
+       float cx = 0, cy = 0;
+       double dr = 0;
+       if( psz > 0 ) {
+               for( int i=0; i<psz; ++i ) {
+                       MaskPoint *p  = points[i];
+                       cx += p->x;  cy += p->y;
+               }
+               cx /= psz;  cy /= psz;
+               for( int i=0; i<psz; ++i ) {
+                       MaskPoint *p  = points[i];
+                       float dx = fabsf(p->x-cx), dy = fabsf(p->y-cy);
+                       double d = sqrt(dx*dx + dy*dy);
+                       if( dr < d ) dr = d;
+               }
+       }
+       if( dr > 0 ) {
+               float out_w = mwindow->edl->session->output_w;
+               float out_h = mwindow->edl->session->output_h;
+               float r = bmax(out_w, out_h);
+               float s = r / (4 * dr * sqrt(2.));
+               for( int i=0; i<psz; ++i ) {
+                       MaskPoint *p  = points[i];
+                       float x = p->x, y = p->y;
+                       p->x = (x-cx) * s + cx;
+                       p->y = (y-cy) * s + cy;
+                       p->control_x1 *= s;  p->control_y1 *= s;
+                       p->control_x2 *= s;  p->control_y2 *= s;
+               }
+       }
+#ifdef USE_KEYFRAME_SPANNING
+       autos->update_parameter(keyframe);
+#endif
+       update_preview();
+
+       mwindow->undo->update_undo_after(_("mask normal"), LOAD_AUTOMATION);
+       return 1;
+}
+
+
+CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow,
+       CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_GenericButton(x, y, w, _("Load"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("Load preset"));
+}
+
+int CWindowMaskLoad::handle_event()
+{
+       gui->mask_shape->create_objects();
+       int px, py;
+       get_abs_cursor(px, py);
+       return gui->mask_shape->activate(px, py, 120,160);
+}
+
+
+CWindowMaskSave::CWindowMaskSave(MWindow *mwindow,
+       CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_GenericButton(x, y, w, _("Save"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("Save preset"));
+}
+
+CWindowMaskSave::~CWindowMaskSave()
+{
+}
+
+int CWindowMaskSave::handle_event()
+{
+       Track *track;
+       MaskAutos *autos;
+       MaskAuto *keyframe;
+       SubMask *mask;
+       MaskPoint *point;
+       gui->get_keyframe(track, autos, keyframe, mask, point, 0);
+       if( track ) {
+               int sx = 0, sy = 0;
+               gui->get_abs_cursor(sx, sy);
+               if( !gui->preset_dialog )
+                       gui->preset_dialog = new CWindowMaskPresetDialog(mwindow, gui);
+               gui->preset_dialog->start_dialog(sx, sy, keyframe);
+       }
+       return 1;
+}
+
+CWindowMaskPresetDialog::CWindowMaskPresetDialog(MWindow *mwindow, CWindowMaskGUI *gui)
+ : BC_DialogThread()
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       pgui = 0;
+}
+
+CWindowMaskPresetDialog::~CWindowMaskPresetDialog()
+{
+       close_window();
+}
+
+void CWindowMaskPresetDialog::handle_close_event(int result)
+{
+       pgui = 0;
+}
+
+void CWindowMaskPresetDialog::handle_done_event(int result)
+{
+       if( result ) return;
+       const char *nm = pgui->preset_text->get_text();
+       if( keyframe )
+               gui->save_mask(nm);
+       else
+               gui->del_mask(nm);
+}
+
+BC_Window* CWindowMaskPresetDialog::new_gui()
+{
+       pgui = new CWindowMaskPresetGUI(this, sx, sy,
+               keyframe ? _(PROGRAM_NAME ": Save Mask") :
+                          _(PROGRAM_NAME ": Delete Mask"));
+       pgui->create_objects();
+       return pgui;
+}
+
+void CWindowMaskPresetDialog::start_dialog(int sx, int sy, MaskAuto *keyframe)
+{
+       close_window();
+       this->sx = sx;  this->sy = sy;
+       this->keyframe = keyframe;
+       start();
+}
+
+CWindowMaskPresetGUI::CWindowMaskPresetGUI(CWindowMaskPresetDialog *preset_dialog,
+                       int x, int y, const char *title)
+ : BC_Window(title, x, y, 320, 100, 320, 100, 0, 0, 1)
+{
+       this->preset_dialog = preset_dialog;
+}
+
+void CWindowMaskPresetGUI::create_objects()
+{
+       int x = 10, y = 10, pad = 8;
+       lock_window("CWindowMaskPresetGUI::create_objects");
+       BC_Title *title;
+       add_subwindow(title = new BC_Title(x, y,
+               preset_dialog->keyframe ? _("Save mask:") : _("Delete mask:")));
+       int x1 = x + title->get_w() + pad;
+       int x2 = get_w() - x - pad - x1 -
+               BC_WindowBase::get_resources()->listbox_button[0]->get_w();
+       CWindowMaskGUI *gui = preset_dialog->gui;
+       preset_text = new CWindowMaskPresetText(this,
+               x1, y, x2, 120, gui->mask_name->get_text());
+       preset_text->create_objects();
+       preset_text->set_tooltip(_("Mask name"));
+       preset_text->update_items();
+       add_subwindow(new BC_OKButton(this));
+       add_subwindow(new BC_CancelButton(this));
+       show_window();
+       raise_window();
+       unlock_window();
+}
+
+CWindowMaskPresetText::CWindowMaskPresetText(CWindowMaskPresetGUI *pgui,
+               int x, int y, int w, int h, const char *text)
+ : BC_PopupTextBox(pgui, 0, text, x, y, w, h)
+{
+       this->pgui = pgui;
+}
+
+int CWindowMaskPresetText::handle_event()
+{
+       int k = get_number();
+       if( k >= 0 && k<mask_items.size() )
+               update(mask_items[k]->get_text());
+       return 1;
+}
+
+void CWindowMaskPresetText::update_items()
+{
+       mask_items.remove_all_objects();
+       ArrayList<SubMask *> masks;
+       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));
+               mask_items.append(new CWindowMaskItem(text));
+       }
+       masks.remove_all_objects();
+       update_list(&mask_items);
+}
+
+
+CWindowMaskDelete::CWindowMaskDelete(MWindow *mwindow,
+       CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_GenericButton(x, y, w, _("Del"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("delete preset"));
+}
+
+int CWindowMaskDelete::handle_event()
+{
+       int sx = 0, sy = 0;
+       gui->get_abs_cursor(sx, sy);
+       if( !gui->preset_dialog )
+               gui->preset_dialog = new CWindowMaskPresetDialog(mwindow, gui);
+       gui->preset_dialog->start_dialog(sx, sy, 0);
+       return 1;
+}
+
+
+CWindowMaskCenter::CWindowMaskCenter(MWindow *mwindow,
+       CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_GenericButton(x, y, w, _("Center"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("center mask"));
+}
+
+int CWindowMaskCenter::handle_event()
+{
+       return gui->center_mask();
+}
+
+
+CWindowMaskNormal::CWindowMaskNormal(MWindow *mwindow,
+       CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_GenericButton(x, y, w, _("Normal"))
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       set_tooltip(_("normalize mask"));
+}
+
+int CWindowMaskNormal::handle_event()
+{
+       return gui->normal_mask();
+}
+
+
+CWindowMaskShape::CWindowMaskShape(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);
+}
+
+CWindowMaskShape::~CWindowMaskShape()
+{
+}
+
+void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask)
+{
+       int out_w = mwindow->edl->session->output_w;
+       int out_h = mwindow->edl->session->output_h;
+       float cx = out_w/2.f, cy = out_h/2.f;
+       float r = bmax(cx, cy) / 4.f;
+       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;
+       points.remove_all_objects();
+       switch( i ) {
+       case 0: // square
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy - r;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy - r;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy + r;
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy + r;
+               break;
+       case 1: // circle
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy - r;
+               pt->control_x1 = -rc;  pt->control_y1 =  rc;
+               pt->control_x2 =  rc;  pt->control_y2 = -rc;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy - r;
+               pt->control_x1 = -rc;  pt->control_y1 = -rc;
+               pt->control_x2 =  rc;  pt->control_y2 =  rc;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy + r;
+               pt->control_x1 =  rc;  pt->control_y1 = -rc;
+               pt->control_x2 = -rc;  pt->control_y2 =  rc;
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy + r;
+               pt->control_x1 =  rc;  pt->control_y1 =  rc;
+               pt->control_x2 = -rc;  pt->control_y2 = -rc;
+               break;
+       case 2: // triangle
+               points.append(pt = new MaskPoint());
+               pt->x = cx + 0;  pt->y = cy - r*(sqrt(3.)-1.);
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy + r;
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy + r;
+               break;
+       case 3: // oval
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy - r2;
+               pt->control_x1 = -r2;  pt->control_y1 =  r4;
+               pt->control_x2 =  r2;  pt->control_y2 = -r4;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy - r2;
+               pt->control_x1 = -r2;  pt->control_y1 = -r4;
+               pt->control_x2 =  r2;  pt->control_y2 =  r4;
+               points.append(pt = new MaskPoint());
+               pt->x = cx + r;  pt->y = cy + r2;
+               pt->control_x1 =  r2;  pt->control_y1 = -r4;
+               pt->control_x2 = -r2;  pt->control_y2 =  r4;
+               points.append(pt = new MaskPoint());
+               pt->x = cx - r;  pt->y = cy + r2;
+               pt->control_x1 =  r2;  pt->control_y1 =  r4;
+               pt->control_x2 = -r2;  pt->control_y2 = -r4;
+               break;
+       }
+}
+
+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;
+       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);
+       int k = get_selection_number(0, 0);
+       if( track && k >= 0 ) {
+#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
+               if( mask ) {
+                       if( k < 4 )
+                               builtin_shape(k, mask);
+                       else
+                               load_shape(k-4, mask);
+#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 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];
+        sprintf(path, "%s/%s", File::get_config_path(), MASKS_FILE);
+        FileSystem fs;
+        fs.complete_path(path);
+       FileXML file;
+       file.read_from_file(path, 1);
+
+       masks.remove_all_objects();
+       int result;
+       while( !(result = file.read_tag()) ) {
+               if( file.tag.title_is("MASK") ) {
+                       SubMask *sub_mask = new SubMask(0, -1);
+                       char name[BCTEXTLEN];  name[0] = 0;
+                       file.tag.get_property("NAME", name);
+                       strncpy(sub_mask->name, name, sizeof(sub_mask->name));
+                       sub_mask->load(&file);
+                       masks.append(sub_mask);
+               }
+       }
+}
+
+void CWindowMaskGUI::save_masks(ArrayList<SubMask *> &masks)
+{
+       FileXML file;
+       for( int i=0; i<masks.size(); ++i ) {
+               SubMask *sub_mask = masks[i];
+               sub_mask->copy(&file);
+       }
+       file.terminate_string();
+
+        char path[BCTEXTLEN];
+        sprintf(path, "%s/%s", File::get_config_path(), MASKS_FILE);
+        FileSystem fs;
+        fs.complete_path(path);
+       file.write_to_file(path);
+}
+
+
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), 320, 240)
 {
index 7340fa8..bfca94c 100644 (file)
@@ -449,6 +449,118 @@ public:
        CWindowMaskGUI *gui;
 };
 
+class CWindowMaskLoad : public BC_GenericButton
+{
+public:
+       CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui,
+                       int x, int y, int w);
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+};
+
+class CWindowMaskSave : public BC_GenericButton
+{
+public:
+       CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui,
+                       int x, int y, int w);
+       ~CWindowMaskSave();
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+       CWindowMaskPresetDialog *preset_dialog;
+};
+
+class CWindowMaskPresetDialog : public BC_DialogThread
+{
+public:
+       CWindowMaskPresetDialog(MWindow *mwindow, CWindowMaskGUI *gui);
+       ~CWindowMaskPresetDialog();
+       void handle_close_event(int result);
+       void handle_done_event(int result);
+       BC_Window* new_gui();
+       void start_dialog(int sx, int sy, MaskAuto *keyframe);
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+       CWindowMaskPresetGUI *pgui;
+       int sx, sy;
+       MaskAuto *keyframe;
+};
+
+class CWindowMaskPresetGUI : public BC_Window
+{
+public:
+       CWindowMaskPresetGUI(CWindowMaskPresetDialog *preset_dialog,
+                       int x, int y, const char *title);
+       void create_objects();
+
+       CWindowMaskPresetDialog *preset_dialog;
+       CWindowMaskPresetText *preset_text;
+};
+
+class CWindowMaskPresetText : public BC_PopupTextBox
+{
+public:
+       CWindowMaskPresetText(CWindowMaskPresetGUI *pgui,
+               int x, int y, int w, int h, const char *text);
+       int handle_event();
+       void update_items();
+
+       CWindowMaskPresetGUI *pgui;
+       CWindowMaskItems mask_items;
+};
+
+class CWindowMaskDelete : public BC_GenericButton
+{
+public:
+       CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui,
+                       int x, int y, int w);
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+};
+
+class CWindowMaskCenter : public BC_GenericButton
+{
+public:
+       CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui,
+                       int x, int y, int w);
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+};
+
+class CWindowMaskNormal : public BC_GenericButton
+{
+public:
+       CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui,
+                       int x, int y, int w);
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+};
+
+class CWindowMaskShape : public BC_ListBox
+{
+public:
+       CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui);
+       ~CWindowMaskShape();
+       void create_objects();
+       void builtin_shape(int i, SubMask *sub_mask);
+       void load_shape(int i, SubMask *sub_mask);
+       int handle_event();
+
+       MWindow *mwindow;
+       CWindowMaskGUI *gui;
+       CWindowMaskItems shape_items;
+};
+
 class CWindowDisableOpenGLMasking : public BC_CheckBox
 {
 public:
@@ -470,9 +582,15 @@ public:
        void handle_event();
        void set_focused(int v, float cx, float cy);
        void update_buttons(MaskAuto *keyframe, int k);
-       int smooth_mask(int typ, int on);
        void get_keyframe(Track* &track, MaskAutos* &autos, MaskAuto* &keyframe,
                SubMask* &mask, MaskPoint* &point, int create_it);
+       void load_masks(ArrayList<SubMask *> &masks);
+       void save_masks(ArrayList<SubMask *> &masks);
+       int smooth_mask(int typ, int on);
+       int save_mask(const char *nm);
+       int del_mask(const char *nm);
+       int center_mask();
+       int normal_mask();
 
        CWindowMaskOnTrack *mask_on_track;
        CWindowMaskTrackTumbler *mask_track_tumbler;
@@ -482,9 +600,16 @@ public:
        BC_Title *mask_blabels[SUBMASKS];
        CWindowMaskEnable *mask_enables[SUBMASKS];
        CWindowMaskSoloTrack *mask_solo_track;
-       CWindowMaskDelMask *del_mask;
-       CWindowMaskUnclear *unclr_mask;
-       CWindowMaskClrMask *clr_mask;
+       CWindowMaskDelMask *mask_del;
+       CWindowMaskUnclear *mask_unclr;
+       CWindowMaskClrMask *mask_clr;
+       CWindowMaskShape *mask_shape;
+       CWindowMaskSave *mask_save;
+       CWindowMaskLoad *mask_load;
+       CWindowMaskDelete *mask_delete;
+       CWindowMaskPresetDialog *preset_dialog;
+       CWindowMaskCenter *mask_center;
+       CWindowMaskNormal *mask_normal;
        CWindowMaskFade *fade;
        CWindowMaskFadeSlider *fade_slider;
        CWindowMaskGangFader *gang_fader;
index c1a2107..9097bed 100644 (file)
@@ -43,8 +43,7 @@ class CWindowMaskFade;
 class CWindowMaskFadeSlider;
 class CWindowMaskGangFader;
 class CWindowMaskGangFocus;
-class CWindowMaskSmooth;
-class CWindowMaskGangSmooth;
+class CWindowMaskSmoothButton;
 class CWindowMaskAffectedPoint;
 class CWindowMaskFocus;
 class CWindowMaskHelp;
@@ -55,6 +54,15 @@ class CWindowMaskFeather;
 class CWindowMaskFeatherSlider;
 class CWindowMaskGangFeather;
 class CWindowMaskBeforePlugins;
+class CWindowMaskLoad;
+class CWindowMaskSave;
+class CWindowMaskPresetDialog;
+class CWindowMaskPresetGUI;
+class CWindowMaskPresetText;
+class CWindowMaskDelete;
+class CWindowMaskCenter;
+class CWindowMaskNormal;
+class CWindowMaskShape;
 class CWindowDisableOpenGLMasking;
 class CWindowMaskGUI;
 class CWindowEyedropGUI;
index 3ddd946..e490f4c 100644 (file)
@@ -96,10 +96,12 @@ int SubMask::operator==(SubMask& ptr)
        return equivalent(ptr);
 }
 
-void SubMask::copy_from(SubMask& ptr)
+void SubMask::copy_from(SubMask& ptr, int do_name)
 {
-       memset(name, 0, sizeof(name));
-       strncpy(name, ptr.name, sizeof(name-1));
+       if( do_name ) {
+               memset(name, 0, sizeof(name));
+               strncpy(name, ptr.name, sizeof(name-1));
+       }
        fader = ptr.fader;
        feather = ptr.feather;
        points.remove_all_objects();
@@ -140,7 +142,8 @@ void SubMask::copy(FileXML *file)
        if(points.total)
        {
                file->tag.set_title("MASK");
-               file->tag.set_property("NUMBER", keyframe->masks.number_of(this));
+               file->tag.set_property("NUMBER",
+                       !keyframe ? -1 : keyframe->masks.number_of(this));
                file->tag.set_property("NAME", name);
                file->tag.set_property("FADER", fader);
                file->tag.set_property("FEATHER", feather);
index 847b18a..acc035c 100644 (file)
@@ -54,7 +54,7 @@ public:
 
        int operator==(SubMask& ptr);
        int equivalent(SubMask& ptr);
-       void copy_from(SubMask& ptr);
+       void copy_from(SubMask& ptr, int do_name=1);
        void load(FileXML *file);
        void copy(FileXML *file);
        void dump(FILE *fp);
index 35ec907..f184717 100644 (file)
@@ -30,6 +30,7 @@
 #define PRESETS_FILE "Cinelerra_presets"
 #define EXPANDERS_FILE "expanders.txt"
 #define PERPETUAL_FILE "perpetual.dat"
+#define MASKS_FILE "masks_rc"
 // factory presets
 #define FACTORY_FILE "Cinelerra_factory"
 #define PICTURE_FILE "Cinelerra_picture"
index 22ece80..0f74a57 100644 (file)
@@ -7,7 +7,7 @@
        <title></title>
        <meta name="generator" content="LibreOffice 5.2.7.2 (Linux)"/>
        <meta name="created" content="00:00:00"/>
-       <meta name="changed" content="2018-04-03T19:40:27.221227659"/>
+       <meta name="changed" content="2019-07-08T19:40:27.221227659"/>
        
        <style type="text/css">
                body,div,table,thead,tbody,tfoot,tr,th,td,p { font-family:"Liberation Sans"; font-size:x-small }
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
-               <td align="left"><font face="Liberation Serif" size=4> +Delete mask</font></td>
+               <td align="left"><font face="Liberation Serif" size=4> + Delete mask</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Shf+delete btn</font></td>
-               <td align="left"><font face="Liberation Serif" size=4>Hold down Shift + click Delete to delete mask</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Hold down Shift + click Delete to delete point</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4> + Edit point</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Shift-set pivot</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Hold down Shift+middle mouse to set Pivot point</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4> + Rotate mask</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Wheel-rotate</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Wheel middle mouse to rotate around Pivot</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4> + Scale mask</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Shift+Wheel</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Hold down Shift+Wheel mouse to scale around Pivot</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4> + Rotate/Scale</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Ctrl+Wheel</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Hold down Ctrl+Wheel to rotate/scale around pointer</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blond/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blue/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_bright/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_cakewalk/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_hulk/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_pinklady/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_all_smooth.png differ
index ab72360..3ce3ed8 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_dn.png differ
index 439138b..1ad1a99 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_hi.png differ
index 3839f00..d633ed4 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_suv/data/mask_pnt_smooth.png differ
index 631bfa4..f6481eb 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_linear.png differ
index ce744be..369ddaa 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_all_smooth.png differ
index ab72360..8bb6c13 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_dn.png differ
index 439138b..5f2cfe9 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_hi.png differ
index 3839f00..d64532f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_button_up.png differ
index 4e1a8d7..98f9a83 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_linear.png differ
index d606055..1feb15c 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_crv_smooth.png differ
index 65b3b9c..8dd77d3 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_linear.png differ
index ce02e4c..fee20de 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png and b/cinelerra-5.1/plugins/theme_unflat/data/mask_pnt_smooth.png differ