Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / crikey / crikeywindow.C

diff --git a/cinelerra-5.1/plugins/crikey/crikeywindow.C b/cinelerra-5.1/plugins/crikey/crikeywindow.C
index 179d66e275a302ff03c653b4f491b29eb1ef5e77..ec3ee2e0c7678bcdb20cb98db779c9779be78afd 100644 (file)
--- a/cinelerra-5.1/plugins/crikey/crikeywindow.C
+++ b/cinelerra-5.1/plugins/crikey/crikeywindow.C
@@ -36,11 +36,11 @@
 #include "theme.h"
 #include "track.h"
 
-#define COLOR_W 50
-#define COLOR_H 30
+#define COLOR_W xS(50)
+#define COLOR_H yS(30)
 
 CriKeyNum::CriKeyNum(CriKeyWindow *gui, int x, int y, float output)
- : BC_TumbleTextBox(gui, output, -32767.0f, 32767.0f, x, y, 120)
+ : BC_TumbleTextBox(gui, output, -32767.0f, 32767.0f, x, y, xS(120))
 {
        this->gui = gui;
        set_increment(1);
@@ -90,7 +90,7 @@ int CriKeyDrawModeItem::handle_event()
        return 1;
 }
 CriKeyDrawMode::CriKeyDrawMode(CriKeyWindow *gui, int x, int y)
- : BC_PopupMenu(x, y, 100, "", 1)
+ : BC_PopupMenu(x, y, xS(100), "", 1)
 {
        this->gui = gui;
        draw_modes[DRAW_ALPHA]     = _("Alpha");
@@ -115,7 +115,7 @@ void CriKeyDrawMode::update(int mode, int send)
 
 
 CriKeyWindow::CriKeyWindow(CriKey *plugin)
- : PluginClientWindow(plugin, 380, 400, 380, 400, 0)
+ : PluginClientWindow(plugin, xS(380), yS(400), xS(380), yS(400), 0)
 {
        this->plugin = plugin;
        this->title_x = 0;    this->point_x = 0;
@@ -135,16 +135,18 @@ CriKeyWindow::~CriKeyWindow()
 
 void CriKeyWindow::create_objects()
 {
+       int xs10 = xS(10), xs32 = xS(32);
+       int ys5 = yS(5), ys10 = yS(10);
        int x = 10, y = 10;
        int margin = plugin->get_theme()->widget_border;
        BC_Title *title;
-       add_subwindow(title = new BC_Title(x, y+5, _("Draw mode:")));
-       int x1 = x + title->get_w() + 10 + margin;
+       add_subwindow(title = new BC_Title(x, y+ys5, _("Draw mode:")));
+       int x1 = x + title->get_w() + xs10 + margin;
        add_subwindow(draw_mode = new CriKeyDrawMode(this, x1, y));
        draw_mode->create_objects();
-       y += draw_mode->get_h() + 10 + margin;
+       y += draw_mode->get_h() + ys10 + margin;
 
-       CriKeyPoint *pt = plugin->config.points[plugin->config.selected];
+       CriKeyPoint *pt = plugin->config.points[plugin->selected];
        add_subwindow(title_x = new BC_Title(x, y, _("X:")));
        x1 = x + title_x->get_w() + margin;
        point_x = new CriKeyPointX(this, x1, y, pt->x);
@@ -162,25 +164,25 @@ void CriKeyWindow::create_objects()
        add_subwindow(del_point = new CriKeyDelPoint(this, plugin, x1, y));
        x1 += del_point->get_w() + margin;
        add_subwindow(point_dn = new CriKeyPointDn(this, x1, y));
-       y += point_y->get_h() + margin + 10;
+       y += point_y->get_h() + margin + ys10;
        add_subwindow(title = new BC_Title(x, y, _("Threshold:")));
        y += title->get_h() + margin;
        add_subwindow(threshold = new CriKeyThreshold(this, x, y, get_w() - x * 2));
        y += threshold->get_h() + margin;
 
        add_subwindow(drag = new CriKeyDrag(this, x, y));
-       if( plugin->config.drag ) {
+       if( plugin->drag ) {
                if( !grab(plugin->server->mwindow->cwindow->gui) )
                        eprintf("drag enabled, but compositor already grabbed\n");
        }
-       x1 = x + drag->get_w() + margin + 32;
-       add_subwindow(reset = new CriKeyReset(this, plugin, x1, y+3));
+       x1 = x + drag->get_w() + margin + xs32;
+       add_subwindow(reset = new CriKeyReset(this, plugin, x1, y+yS(3)));
        y += drag->get_h() + margin;
 
        add_subwindow(point_list = new CriKeyPointList(this, plugin, x, y));
-       point_list->update(plugin->config.selected);
+       point_list->update(plugin->selected);
 
-       y += point_list->get_h() + 10;
+       y += point_list->get_h() + ys10;
        add_subwindow(notes = new BC_Title(x, y,
                 _("Right click in composer: create new point\n"
                   "Shift-left click in Enable field:\n"
@@ -341,15 +343,15 @@ void CriKeyWindow::done_event(int result)
 }
 
 CriKeyPointList::CriKeyPointList(CriKeyWindow *gui, CriKey *plugin, int x, int y)
- : BC_ListBox(x, y, 360, 130, LISTBOX_TEXT)
+ : BC_ListBox(x, y, xS(360), yS(130), LISTBOX_TEXT)
 {
        this->gui = gui;
        this->plugin = plugin;
-       titles[PT_E] = _("E");    widths[PT_E] = 50;
-       titles[PT_X] = _("X");    widths[PT_X] = 90;
-       titles[PT_Y] = _("Y");    widths[PT_Y] = 90;
-       titles[PT_T] = _("T");    widths[PT_T] = 70;
-       titles[PT_TAG] = _("Tag");  widths[PT_TAG] = 50;
+       titles[PT_E] = _("E");    widths[PT_E] = xS(50);
+       titles[PT_X] = _("X");    widths[PT_X] = xS(90);
+       titles[PT_Y] = _("Y");    widths[PT_Y] = xS(90);
+       titles[PT_T] = _("T");    widths[PT_T] = xS(70);
+       titles[PT_TAG] = _("Tag");  widths[PT_TAG] = xS(50);
 }
 CriKeyPointList::~CriKeyPointList()
 {
@@ -468,7 +470,7 @@ void CriKeyPointList::update(int k)
        if( k >= 0 && k < sz ) {
                gui->point_x->update(gui->point_list->cols[PT_X].get(k)->get_text());
                gui->point_y->update(gui->point_list->cols[PT_Y].get(k)->get_text());
-               plugin->config.selected = k;
+               plugin->selected = k;
        }
 
        update_list(k);
@@ -476,9 +478,9 @@ void CriKeyPointList::update(int k)
 
 void CriKeyWindow::update_gui()
 {
-       draw_mode->update(plugin->config.draw_mode);
        threshold->update(plugin->config.threshold);
-       drag->update(plugin->config.drag);
+       draw_mode->update(plugin->config.draw_mode);
+       drag->update(plugin->drag);
        point_list->update(-1);
 }
 
@@ -566,7 +568,7 @@ int CriKeyPointDn::handle_event()
 }
 
 CriKeyDrag::CriKeyDrag(CriKeyWindow *gui, int x, int y)
- : BC_CheckBox(x, y, gui->plugin->config.drag, _("Drag"))
+ : BC_CheckBox(x, y, gui->plugin->drag, _("Drag"))
 {
        this->gui = gui;
 }
@@ -582,13 +584,23 @@ int CriKeyDrag::handle_event()
        }
        else
                gui->ungrab(cwindow_gui);
-       gui->plugin->config.drag = value;
+       gui->plugin->drag = value;
        gui->send_configure_change();
        return 1;
 }
+int CriKeyWindow::handle_ungrab()
+{
+       CWindowGUI *cwindow_gui = plugin->server->mwindow->cwindow->gui;
+       int ret = ungrab(cwindow_gui);
+       if( ret ) {
+               drag->update(0);
+               plugin->drag = 0;
+       }
+       return ret;
+}
 
 CriKeyNewPoint::CriKeyNewPoint(CriKeyWindow *gui, CriKey *plugin, int x, int y)
- : BC_GenericButton(x, y, 80, _("New"))
+ : BC_GenericButton(x, y, xS(80), _("New"))
 {
        this->gui = gui;
        this->plugin = plugin;
@@ -605,7 +617,7 @@ int CriKeyNewPoint::handle_event()
 }
 
 CriKeyDelPoint::CriKeyDelPoint(CriKeyWindow *gui, CriKey *plugin, int x, int y)
- : BC_GenericButton(x, y, 80, C_("Del"))
+ : BC_GenericButton(x, y, xS(80), C_("Del"))
 {
        this->gui = gui;
        this->plugin = plugin;