#debian 32bit: export ac_cv_header_xmmintrin_h=no
"debian")
apt-get -f -y install apt-file sox nasm yasm g++ build-essential zlib1g-dev \
- texinfo libpng12-dev freeglut3-dev libxv-dev libasound2-dev libbz2-dev \
+ texinfo libpng-dev freeglut3-dev libxv-dev libasound2-dev libbz2-dev \
libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \
libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \
fonts-dejavu libopenexr-dev festival libfftw3-dev gdb libusb-1.0-0-dev \
CtrlToggle *ctrl_toggle = new CtrlToggle(x1, y1, pwindow);
add_subwindow(ctrl_toggle);
y1 += ctrl_toggle->get_h() + 5;
+ RectifyAudioToggle *rect_toggle = new RectifyAudioToggle(x1, y1, pwindow);
+ add_subwindow(rect_toggle);
+ y1 += rect_toggle->get_h() + 5;
if( y < y1 ) y = y1;
}
return 1;
}
+RectifyAudioToggle::RectifyAudioToggle(int x, int y, PreferencesWindow *pwindow)
+ : BC_CheckBox(x, y,
+ pwindow->thread->preferences->rectify_audio, _("Timeline Rectify Audio"))
+{
+ this->pwindow = pwindow;
+}
+
+int RectifyAudioToggle::handle_event()
+{
+ pwindow->thread->preferences->rectify_audio = get_value();
+ return 1;
+}
+
PreferencesWindow *pwindow;
};
+class RectifyAudioToggle : public BC_CheckBox
+{
+public:
+ RectifyAudioToggle(int x, int y, PreferencesWindow *pwindow);
+ int handle_event();
+ PreferencesWindow *pwindow;
+};
+
#endif
CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
: CWindowToolGUI(mwindow, thread,
- _(PROGRAM_NAME ": Mask"), 460, 700)
+ _(PROGRAM_NAME ": Mask"), 440, 700)
{
this->mwindow = mwindow;
this->thread = thread;
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;
mask_blabels[i] = new BC_Title(x2+tx, y, text);
add_subwindow(mask_blabels[i]);
}
- x2 += margin;
- add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, x2, y, 80));
y += mask_blabels[0]->get_h() + margin;
add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*margin));
x2 = x1;
mask_enables[i] = new CWindowMaskEnable(mwindow, this, x2, y, i, 1);
add_subwindow(mask_enables[i]);
}
- x2 += margin;
- add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, x2, y, 80));
y += mask_enables[0]->get_h() + 2*margin;
- add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Presets shapes")));
y += title_bar->get_h() + margin;
+ int x3 = get_w()/5+1, x4 = (5*get_w())/8 + 1;
+ add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this,
+ "mask_prst_sqr_images", MASK_SHAPE_SQUARE, x2=x3, y, _("Square")));
+ x2 += mask_shape_sqr->get_w() + 2*margin;
+ add_subwindow(mask_shape_crc = new CWindowMaskShape(mwindow, this,
+ "mask_prst_crc_images", MASK_SHAPE_CIRCLE, x2, y, _("Circle")));
+ x2 += mask_shape_crc->get_w() + 2*margin;
+ add_subwindow(mask_shape_tri = new CWindowMaskShape(mwindow, this,
+ "mask_prst_tri_images", MASK_SHAPE_TRIANGLE, x2, y, _("Triangle")));
+ x2 += mask_shape_tri->get_w() + 2*margin;
+ add_subwindow(mask_shape_ovl = new CWindowMaskShape(mwindow, this,
+ "mask_prst_ovl_images", MASK_SHAPE_OVAL, x2, y, _("Oval")));
+ x2 += mask_shape_ovl->get_w() + 2*margin;
+ add_subwindow(mask_load_list = new CWindowMaskLoadList(mwindow, this));
+ add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, x2=x4, 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;
+ 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, x2=x3, y, 80));
+ x2 += mask_center->get_w() + 2*margin;
+ add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, x2, y, 80));
+
+ add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
+ x2=x4, y, theme->get_image_set("mask_scale_x"), 0, 0, _("scale x")));
+ x2 += mask_scale_x->get_w() + 2*margin;
+ add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this,
+ x2, y, theme->get_image_set("mask_scale_y"), 0, 1, _("scale y")));
+ x2 += mask_scale_y->get_w() + 2*margin;
+ add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
+ x2, y, theme->get_image_set("mask_scale_xy"), 1, 2, _("scale xy")));
+ y += mask_center->get_h() + 2*margin;
+ add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+ y += title_bar->get_h() + 2*margin;
add_subwindow(title = new BC_Title(x, y, _("Fade:")));
fade = new CWindowMaskFade(mwindow, this, x1, y);
add_subwindow(title = new BC_Title(x, y, _("Point:")));
active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
active_point->create_objects();
- int x3 = x1 + active_point->get_w() + 4*margin;
+ 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;
+ 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"));
add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y));
float cx = mwindow->edl->session->output_w / 2.f;
focus_x = new CWindowCoord(this, x1, y, cx);
focus_x->create_objects();
- x2 = x1 + focus_x->get_w() + 3*margin;
- add_subwindow(title = new BC_Title(x2, y, _("Scaling Mode:")));
x2 = clr_x - 2*margin - CWindowMaskFocus::calculate_w(this);
add_subwindow(focus = new CWindowMaskFocus(mwindow, this, x2, y));
add_subwindow(gang_focus = new CWindowMaskGangFocus(mwindow, this, clr_x, y));
float cy = mwindow->edl->session->output_h / 2.f;
focus_y = new CWindowCoord(this, x1, y, cy);
focus_y->create_objects();
- x2 = x1 + focus_y->get_w() + 3*margin;
- add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
- x2, y, theme->get_image_set("mask_scale_x"), 0, 0, _("scale x")));
- x2 += mask_scale_x->get_w() + margin;
- add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this,
- x2, y, theme->get_image_set("mask_scale_y"), 0, 1, _("scale y")));
- x2 += mask_scale_y->get_w() + margin;
- add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
- x2, y, theme->get_image_set("mask_scale_xy"), 1, 2, _("scale xy")));
- 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));
}
+CWindowMaskLoadList::CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui)
+ : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+{
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_use_button(0);
+}
+
+CWindowMaskLoadList::~CWindowMaskLoadList()
+{
+}
+
+
+int CWindowMaskLoadList::handle_event()
+{
+ MaskAutos *autos;
+ MaskAuto *keyframe;
+ Track *track;
+ MaskPoint *point;
+ SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+ int create_it = 0;
+#else
+ int create_it = 1;
+#endif
+
+ mwindow->undo->update_undo_before(_("mask shape"), this);
+
+// Get existing keyframe
+ gui->get_keyframe(track, autos, keyframe,
+ mask, point, create_it);
+ CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0);
+ if( track && item ) {
+#ifdef USE_KEYFRAME_SPANNING
+ MaskAuto temp_keyframe(mwindow->edl, autos);
+ temp_keyframe.copy_data(keyframe);
+ keyframe = &temp_keyframe;
+ mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+ ArrayList<SubMask *> masks;
+ gui->load_masks(masks);
+ mask->copy_from(*masks[item->id], 0);
+ masks.remove_all_objects();
+#ifdef USE_KEYFRAME_SPANNING
+ autos->update_parameter(keyframe);
+#endif
+ gui->update();
+ gui->update_preview(1);
+ }
+ mwindow->undo->update_undo_after(_("mask shape"), LOAD_AUTOMATION);
+ return 1;
+}
+
+void CWindowMaskLoadList::create_objects()
+{
+ shape_items.remove_all_objects();
+ ArrayList<SubMask *> masks;
+ gui->load_masks(masks);
+ for( int i=0; i<masks.size(); ++i )
+ shape_items.append(new CWindowMaskItem(masks[i]->name, i));
+ masks.remove_all_objects();
+ update(&shape_items, 0, 0, 1);
+}
+
CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Load"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_load_images"))
{
this->mwindow = mwindow;
this->gui = gui;
int CWindowMaskLoad::handle_event()
{
- gui->mask_shape->create_objects();
+ gui->mask_load_list->create_objects();
int px, py;
get_abs_cursor(px, py);
- return gui->mask_shape->activate(px, py, 120,160);
+ return gui->mask_load_list->activate(px, py, 120,160);
}
CWindowMaskSave::CWindowMaskSave(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Save"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_save_images"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskDelete::CWindowMaskDelete(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Del"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_trsh_images"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskCenter::CWindowMaskCenter(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Center"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_cen_images"))
{
this->mwindow = mwindow;
this->gui = gui;
CWindowMaskNormal::CWindowMaskNormal(MWindow *mwindow,
CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Normal"))
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_nrm_images"))
{
this->mwindow = mwindow;
this->gui = gui;
}
-CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui)
- : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui,
+ const char *images, int shape, int x, int y, const char *tip)
+ : BC_Button(x, y, mwindow->theme->get_image_set(images))
{
this->mwindow = mwindow;
this->gui = gui;
- set_use_button(0);
+ this->shape = shape;
+ set_tooltip(tip);
}
CWindowMaskShape::~CWindowMaskShape()
}
}
-void CWindowMaskShape::load_shape(int i, SubMask *sub_mask)
-{
- ArrayList<SubMask *> masks;
- gui->load_masks(masks);
- sub_mask->copy_from(*masks[i], 0);
- masks.remove_all_objects();
-}
-
int CWindowMaskShape::handle_event()
{
MaskAutos *autos;
// Get existing keyframe
gui->get_keyframe(track, autos, keyframe,
mask, point, create_it);
- CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0);
- if( track && item ) {
+ if( track ) {
#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
- int k = item->id;
if( mask ) {
- if( k < MASK_SHAPE_BUILTIN )
- builtin_shape(k, mask);
- else
- load_shape(k-MASK_SHAPE_BUILTIN, mask);
+ builtin_shape(shape, mask);
#ifdef USE_KEYFRAME_SPANNING
autos->update_parameter(keyframe);
#endif
return 1;
}
-void CWindowMaskShape::create_objects()
-{
- shape_items.remove_all_objects();
- shape_items.append(new CWindowMaskItem(_("square"), MASK_SHAPE_SQUARE));
- shape_items.append(new CWindowMaskItem(_("circle"), MASK_SHAPE_CIRCLE));
- shape_items.append(new CWindowMaskItem(_("triangle"), MASK_SHAPE_TRIANGLE));
- shape_items.append(new CWindowMaskItem(_("oval"), MASK_SHAPE_OVAL));
- ArrayList<SubMask *> masks;
- gui->load_masks(masks);
- int id = MASK_SHAPE_BUILTIN;
- for( int i=0; i<masks.size(); ++i )
- shape_items.append(new CWindowMaskItem(masks[i]->name, id++));
- masks.remove_all_objects();
- update(&shape_items, 0, 0, 1);
-}
-
void CWindowMaskGUI::load_masks(ArrayList<SubMask *> &masks)
{
char path[BCTEXTLEN];
#include "maskautos.inc"
#include "mwindow.inc"
+enum {
+ MASK_SHAPE_SQUARE,
+ MASK_SHAPE_CIRCLE,
+ MASK_SHAPE_TRIANGLE,
+ MASK_SHAPE_OVAL,
+};
// This common thread supports all the tool GUI's.
class CWindowTool : public Thread
CWindowMaskGUI *gui;
};
-class CWindowMaskLoad : public BC_GenericButton
+class CWindowMaskLoadList : public BC_ListBox
+{
+public:
+ CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui);
+ ~CWindowMaskLoadList();
+ void create_objects();
+ int handle_event();
+
+ MWindow *mwindow;
+ CWindowMaskGUI *gui;
+ CWindowMaskItems shape_items;
+};
+
+class CWindowMaskLoad : public BC_Button
{
public:
CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui,
CWindowMaskGUI *gui;
};
-class CWindowMaskSave : public BC_GenericButton
+class CWindowMaskSave : public BC_Button
{
public:
CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui,
CWindowMaskItems mask_items;
};
-class CWindowMaskDelete : public BC_GenericButton
+class CWindowMaskDelete : public BC_Button
{
public:
CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui,
CWindowMaskGUI *gui;
};
-class CWindowMaskCenter : public BC_GenericButton
+class CWindowMaskCenter : public BC_Button
{
public:
CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui,
CWindowMaskGUI *gui;
};
-class CWindowMaskNormal : public BC_GenericButton
+class CWindowMaskNormal : public BC_Button
{
public:
CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui,
CWindowMaskGUI *gui;
};
-class CWindowMaskShape : public BC_ListBox
+class CWindowMaskShape : public BC_Button
{
public:
- enum { MASK_SHAPE_SQUARE, MASK_SHAPE_CIRCLE,
- MASK_SHAPE_TRIANGLE, MASK_SHAPE_OVAL,
- MASK_SHAPE_BUILTIN };
- CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui);
+ CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui,
+ const char *images, int shape, int x, int y, const char *tip);
~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;
+ int shape;
CWindowMaskItems shape_items;
};
CWindowMaskDelMask *mask_del;
CWindowMaskUnclear *mask_unclr;
CWindowMaskClrMask *mask_clr;
- CWindowMaskShape *mask_shape;
- CWindowMaskSave *mask_save;
+ CWindowMaskShape *mask_shape_sqr;
+ CWindowMaskShape *mask_shape_crc;
+ CWindowMaskShape *mask_shape_tri;
+ CWindowMaskShape *mask_shape_ovl;
+ CWindowMaskLoadList *mask_load_list;
CWindowMaskLoad *mask_load;
+ CWindowMaskSave *mask_save;
CWindowMaskDelete *mask_delete;
CWindowMaskPresetDialog *preset_dialog;
CWindowMaskCenter *mask_center;
class CWindowMaskFeatherSlider;
class CWindowMaskGangFeather;
class CWindowMaskBeforePlugins;
+class CWindowMaskLoadList;
class CWindowMaskLoad;
class CWindowMaskSave;
class CWindowMaskPresetDialog;
// Start and length of fragment to read from file in bytes.
float *buffer = 0;
int buffer_shared = 0;
- int center_pixel = mwindow->edl->local_session->zoom_track / 2;
+ int rect_audio = mwindow->preferences->rectify_audio;;
+ int center_pixel = !rect_audio ?
+ mwindow->edl->local_session->zoom_track / 2 :
+ mwindow->edl->local_session->zoom_track;
if( edit->track->show_titles() )
center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
int prev_y1 = center_pixel;
int prev_y2 = center_pixel;
int first_frame = 1;
- int zoom_y = mwindow->edl->local_session->zoom_y, zoom_y2 = zoom_y / 2;
- int max_y = center_pixel + zoom_y2 - 1;
+ int zoom_y = !rect_audio ?
+ mwindow->edl->local_session->zoom_y / 2 :
+ mwindow->edl->local_session->zoom_y;
+ int max_y = center_pixel + zoom_y - 1;
edit_position = (x + pixmap->pixmap_x - virtual_edit_x) * project_zoom;
int64_t speed_position = edit->startsource;
speed_position += !speed_autos ? edit_position :
SET_TRACE
for( int64_t x1=0; x1<w && i < length_index; ++x1 ) {
- float highsample = buffer[i]; ++i;
- float lowsample = buffer[i]; ++i;
+ float highsample = !rect_audio ? buffer[i] : fabsf(buffer[i]); ++i;
+ float lowsample = !rect_audio ? buffer[i] : fabsf(buffer[i]); ++i;
int x2 = x1 + x + 1;
edit_position = (x2 + pixmap->pixmap_x - virtual_edit_x) * project_zoom;
int64_t speed_position = edit->startsource;
int64_t k = 2 * index_position - start_index;
CLAMP(k, 0, length_index);
while( i < k ) {
- highsample = MAX(highsample, buffer[i]); ++i;
- lowsample = MIN(lowsample, buffer[i]); ++i;
+ float high = !rect_audio ? buffer[i] : fabsf(buffer[i]);
+ highsample = MAX(highsample, high); ++i;
+ float low = !rect_audio ? buffer[i] : fabsf(buffer[i]);
+ lowsample = MIN(lowsample, low); ++i;
}
- int y1 = (int)(center_pixel - highsample * zoom_y2);
- int y2 = (int)(center_pixel - lowsample * zoom_y2);
+ int y1 = (int)(center_pixel - highsample * zoom_y);
+ int y2 = (int)(center_pixel - lowsample * zoom_y);
CLAMP(y1, 0, max_y); int next_y1 = y1;
CLAMP(y2, 0, max_y); int next_y2 = y2;
//printf("draw_line (%f,%f) = %d,%d, %d,%d\n", lowsample, highsample, x2, y1, x2, y2);
_("Index Path"), _("Select the directory for index files"), 1));
y += 30;
- add_subwindow(new BC_Title(x, y + 5, _("Size of index file:"),
+ add_subwindow(new BC_Title(x, y + 5, _("Size of index file in KB:"),
MEDIUMFONT, resources->text_default));
- sprintf(string, "%jd", pwindow->thread->preferences->index_size);
+ sprintf(string, "%jd", pwindow->thread->preferences->index_size/1024);
add_subwindow(isize = new IndexSize(x + 230, y, pwindow, string));
add_subwindow(new ScanCommercials(pwindow, 400,y));
{
long result;
- result = atol(get_text());
- if(result < 64000) result = 64000;
+ result = atol(get_text()) * 1024;
+ if( result < 65536 ) result = 65536;
//if(result < 500000) result = 500000;
pwindow->thread->preferences->index_size = result;
return 0;
yuv_color_range = BC_COLORS_JPEG;
autocolor_assets = 0;
ctrl_toggle = 0;
+ rectify_audio = 0;
// Default brender asset
brender_asset = new Asset;
yuv_color_range = that->yuv_color_range;
autocolor_assets = that->autocolor_assets;
ctrl_toggle = that->ctrl_toggle;
+ rectify_audio = that->rectify_audio;
renderfarm_nodes.remove_all_objects();
renderfarm_ports.remove_all();
renderfarm_enabled.remove_all();
yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range);
autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets);
ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle);
+ rectify_audio = defaults->get("RECTIFY_AUDIO", rectify_audio);
use_brender = defaults->get("USE_BRENDER", use_brender);
brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
cache_size = defaults->get("CACHE_SIZE", cache_size);
defaults->update("YUV_COLOR_RANGE", yuv_color_range);
defaults->update("AUTOCOLOR_ASSETS", autocolor_assets);
defaults->update("CTRL_TOGGLE", ctrl_toggle);
+ defaults->update("RECTIFY_AUDIO", rectify_audio);
brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
defaults->update("USE_BRENDER", use_brender);
defaults->update("BRENDER_FRAGMENT", brender_fragment);
int autocolor_assets;
// ctrl_toggle && !ctrl_down() clears selection before toggle
int ctrl_toggle;
+// rectify timeline audio waveform
+ int rectify_audio;
// Default positions for channels
int channel_positions[MAXCHANNELS][MAXCHANNELS];
{
w++;
Indexable *indexable = edit->get_source();
- int center_pixel = mwindow->edl->local_session->zoom_track / 2;
+ int rect_audio = mwindow->preferences->rectify_audio;
+ int center_pixel = !rect_audio ?
+ mwindow->edl->local_session->zoom_track / 2 :
+ mwindow->edl->local_session->zoom_track ;
if( edit->track->show_titles() )
center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
- int64_t scale_y = mwindow->edl->local_session->zoom_y;
+ int64_t scale_y = !rect_audio ?
+ mwindow->edl->local_session->zoom_y :
+ mwindow->edl->local_session->zoom_y * 2;
int y_max = center_pixel + scale_y / 2 - 1;
double project_zoom = mwindow->edl->local_session->zoom_sample;
if( !result ) {
double *samples = buffer->get_data();
- int y1 = center_pixel - samples[0] * scale_y / 2;
+ double sample = !rect_audio ? samples[0] : fabs(samples[0]);
+ int y1 = center_pixel - sample * scale_y / 2;
int y2 = CLIP(y1, 0, y_max);
for( int x0=0; x0<w; ++x0 ) {
int j = speed_position * asset_over_session - start_position;
CLAMP(j, 0, sample_size);
int y0 = y2;
- y1 = center_pixel - samples[j] * scale_y / 2;
+ sample = !rect_audio ? samples[j] : fabs(samples[j]);
+ y1 = center_pixel - sample * scale_y / 2;
y2 = CLIP(y1, 0, y_max);
//printf("ResourcePixmap::draw_audio_source %d %d %d\n", __LINE__, y1, y2);
canvas->draw_line(x0, y0, x2, y2, this);
WaveCacheItem *item = mwindow->wave_cache->get_wave(indexable->id,
edit->channel, prev_position, next_position);
if( item ) {
+ double item_low = !rect_audio ? item->low : fabs(item->low);
//printf("ResourcePixmap::draw_audio_source %d\n", __LINE__);
- int y_lo = (int)(center_pixel - item->low * scale_y / 2);
+ int y_lo = (int)(center_pixel - item_low * scale_y / 2);
int y1 = CLIP(y_lo, 0, y_max);
- int y_hi = (int)(center_pixel - item->high * scale_y / 2);
+ double item_high = !rect_audio ? item->high : fabs(item->high);
+ int y_hi = (int)(center_pixel - item_high * scale_y / 2);
int y2 = CLIP(y_hi, 0, y_max);
if( !first_pixel ) {
y_lo = MIN(y1,prev_y2);
void ResourcePixmap::draw_wave(TrackCanvas *canvas,
int x, double high, double low)
{
- int top_pixel = 0;
- if( mwindow->edl->session->show_titles )
- top_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
- int center_pixel = mwindow->edl->local_session->zoom_track / 2 + top_pixel;
+ int rect_audio = mwindow->preferences->rectify_audio;
+ if( rect_audio ) { low = fabs(low); high = fabs(high); }
+ int top_pixel = mwindow->edl->session->show_titles ? 0 :
+ mwindow->theme->get_image("title_bg_data")->get_h();
+ int center_pixel = !rect_audio ?
+ mwindow->edl->local_session->zoom_track / 2 + top_pixel :
+ mwindow->edl->local_session->zoom_track + top_pixel ;
+ int scale_y = !rect_audio ?
+ mwindow->edl->local_session->zoom_y / 2 :
+ mwindow->edl->local_session->zoom_y ;
int bottom_pixel = top_pixel + mwindow->edl->local_session->zoom_track;
- int y1 = (int)(center_pixel -
- low * mwindow->edl->local_session->zoom_y / 2);
- int y2 = (int)(center_pixel -
- high * mwindow->edl->local_session->zoom_y / 2);
+ int y1 = (int)(center_pixel - low * scale_y);
+ int y2 = (int)(center_pixel - high * scale_y);
CLAMP(y1, top_pixel, bottom_pixel);
CLAMP(y2, top_pixel, bottom_pixel);
canvas->set_color(mwindow->theme->audio_color);
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
new_toggle("loadmode_new.png",
"loadmode_up.png",
"loadmode_hi.png",
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
resources->bar_data = new_image("bar", "bar.png");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
//clock font
resources->medium_7segment = new_image_set(20,
- "black_0.png",
- "black_1.png",
- "black_2.png",
- "black_3.png",
- "black_4.png",
- "black_5.png",
- "black_6.png",
- "black_7.png",
- "black_8.png",
- "black_9.png",
- "black_colon.png",
- "black_period.png",
- "black_a.png",
- "black_b.png",
- "black_c.png",
- "black_d.png",
- "black_e.png",
- "black_f.png",
- "black_space.png",
- "black_dash.png");
+ "black_0.png", "black_1.png", "black_2.png", "black_3.png",
+ "black_4.png", "black_5.png", "black_6.png", "black_7.png",
+ "black_8.png", "black_9.png", "black_colon.png", "black_period.png",
+ "black_a.png", "black_b.png", "black_c.png", "black_d.png",
+ "black_e.png", "black_f.png", "black_space.png", "black_dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_hi.png",
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
resources->min_menu_w = 96;
editpanel_up, editpanel_hi, editpanel_checked,
editpanel_dn, editpanel_checkedhi,
"tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
}
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
// Clock - is not used (AFAIK). See also clock color.
// resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- // "0.png",
- // "1.png",
- // "2.png",
- // "3.png",
- // "4.png",
- // "5.png",
- // "6.png",
- // "7.png",
- // "8.png",
- // "9.png",
- // "colon.png",
- // "period.png",
- // "a.png",
- // "b.png",
- // "c.png",
- // "d.png",
- // "e.png",
- // "f.png",
- // "space.png",
- // "dash.png");
+ // "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ // "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ // "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
editpanel_dn, editpanel_checkedhi,
"tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
"mask_button_dn.png",
"mask_all_smooth_images");
+ new_button("mask_prst_sqr.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_sqr_images");
+ new_button("mask_prst_crc.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_crc_images");
+ new_button("mask_prst_tri.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_tri_images");
+ new_button("mask_prst_ovl.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_ovl_images");
+
+ new_button("mask_prst_load.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_load_images");
+ new_button("mask_prst_save.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_save_images");
+ new_button("mask_prst_trsh.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_prst_trsh_images");
+
+ new_button("mask_pstn_cen.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_cen_images");
+ new_button("mask_pstn_nrm.png",
+ "mask_button_up.png",
+ "mask_button_hi.png",
+ "mask_button_dn.png",
+ "mask_pstn_nrm_images");
+
resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
- "0.png",
- "1.png",
- "2.png",
- "3.png",
- "4.png",
- "5.png",
- "6.png",
- "7.png",
- "8.png",
- "9.png",
- "colon.png",
- "period.png",
- "a.png",
- "b.png",
- "c.png",
- "d.png",
- "e.png",
- "f.png",
- "space.png",
- "dash.png");
+ "0.png", "1.png", "2.png", "3.png", "4.png", "5.png", "6.png", "7.png",
+ "8.png", "9.png", "colon.png", "period.png", "a.png", "b.png", "c.png",
+ "d.png", "e.png", "f.png", "space.png", "dash.png");
resources->bar_data = new_image("bar", "bar.png");
resources->check = new_image("check", "check.png");
new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
- new_toggle("mask_scale_x.png", "mask_scale_xup.png", "mask_scale_xuphi.png",
- "mask_scale_xchkd.png", "mask_scale_xdown.png", "mask_scale_xchkdhi.png",
+ new_toggle("mask_scale_x.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xdown.png", "mask_scale_chkdhi.png",
"mask_scale_x");
- new_toggle("mask_scale_y.png", "mask_scale_yup.png", "mask_scale_yuphi.png",
- "mask_scale_ychkd.png", "mask_scale_ydown.png", "mask_scale_ychkdhi.png",
+ new_toggle("mask_scale_y.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_ydown.png", "mask_scale_chkdhi.png",
"mask_scale_y");
- new_toggle("mask_scale_xy.png", "mask_scale_xyup.png", "mask_scale_xyuphi.png",
- "mask_scale_xychkd.png", "mask_scale_xydown.png", "mask_scale_xychkdhi.png",
+ new_toggle("mask_scale_xy.png", "mask_scale_up.png", "mask_scale_uphi.png",
+ "mask_scale_chkd.png", "mask_scale_xydown.png", "mask_scale_chkdhi.png",
"mask_scale_xy");
flush_images();
projects / goodguy / cinelerra.git / commitdiff
