From b9f98da8f1cd8b7b31ead02fa41f299b56cac3da Mon Sep 17 00:00:00 2001 From: Good Guy Date: Fri, 20 Jul 2018 17:00:37 -0600 Subject: [PATCH] p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default fmt mp4 --- cinelerra-5.1/cinelerra/aboutprefs.C | 2 + cinelerra-5.1/cinelerra/asset.C | 2 +- cinelerra-5.1/cinelerra/assetedit.C | 2 + cinelerra-5.1/cinelerra/assetpopup.C | 4 ++ cinelerra-5.1/cinelerra/awindowgui.C | 4 +- cinelerra-5.1/cinelerra/channeledit.C | 53 ++++----------- cinelerra-5.1/cinelerra/channelinfo.C | 4 ++ cinelerra-5.1/cinelerra/cropvideo.C | 4 +- cinelerra-5.1/cinelerra/deleteallindexes.C | 2 + cinelerra-5.1/cinelerra/editpopup.C | 2 + cinelerra-5.1/cinelerra/effectlist.C | 4 +- cinelerra-5.1/cinelerra/exportedl.C | 8 ++- cinelerra-5.1/cinelerra/featheredits.C | 2 + cinelerra-5.1/cinelerra/filedv.C | 14 ++-- cinelerra-5.1/cinelerra/fileffmpeg.C | 2 + cinelerra-5.1/cinelerra/fileformat.C | 19 +----- cinelerra-5.1/cinelerra/filejpeg.C | 3 +- cinelerra-5.1/cinelerra/filejpeglist.C | 64 ++++-------------- cinelerra-5.1/cinelerra/filempeg.C | 25 +------ cinelerra-5.1/cinelerra/fileogg.C | 24 ++----- cinelerra-5.1/cinelerra/filepng.C | 2 +- cinelerra-5.1/cinelerra/fileppm.C | 7 +- cinelerra-5.1/cinelerra/fileppm.h | 1 + cinelerra-5.1/cinelerra/filesndfile.C | 2 +- cinelerra-5.1/cinelerra/filetga.C | 2 +- cinelerra-5.1/cinelerra/filetiff.C | 2 +- cinelerra-5.1/cinelerra/formatwindow.C | 26 ++----- cinelerra-5.1/cinelerra/gwindowgui.C | 2 +- cinelerra-5.1/cinelerra/labeledit.C | 2 + cinelerra-5.1/cinelerra/mainerror.C | 27 ++++---- cinelerra-5.1/cinelerra/manualgoto.C | 2 + cinelerra-5.1/cinelerra/menueffects.C | 6 +- cinelerra-5.1/cinelerra/meterpanel.C | 2 + cinelerra-5.1/cinelerra/mwindow.C | 29 ++++---- cinelerra-5.1/cinelerra/mwindow.h | 2 +- cinelerra-5.1/cinelerra/mwindowedit.C | 6 -- cinelerra-5.1/cinelerra/mwindowgui.C | 29 +++++++- cinelerra-5.1/cinelerra/mwindowgui.h | 3 + cinelerra-5.1/cinelerra/newfolder.C | 12 +--- cinelerra-5.1/cinelerra/pluginclient.C | 6 +- cinelerra-5.1/cinelerra/plugindialog.C | 5 +- cinelerra-5.1/cinelerra/probeprefs.C | 2 + cinelerra-5.1/cinelerra/proxy.C | 6 +- cinelerra-5.1/cinelerra/recconfirmdelete.C | 2 + cinelerra-5.1/cinelerra/recordwindow.C | 45 +++--------- cinelerra-5.1/cinelerra/reindex.C | 2 + cinelerra-5.1/cinelerra/resizetrackthread.C | 3 +- cinelerra-5.1/cinelerra/scale.C | 2 + cinelerra-5.1/cinelerra/setformat.C | 5 +- cinelerra-5.1/cinelerra/shbtnprefs.C | 4 ++ cinelerra-5.1/cinelerra/splashgui.C | 29 ++++---- cinelerra-5.1/cinelerra/splashgui.h | 1 + cinelerra-5.1/cinelerra/swindow.C | 2 + cinelerra-5.1/cinelerra/theme.C | 5 +- cinelerra-5.1/cinelerra/theme.h | 3 +- cinelerra-5.1/cinelerra/tipwindow.C | 2 + cinelerra-5.1/cinelerra/videowindowgui.C | 14 ++-- cinelerra-5.1/cinelerra/vwindowgui.C | 2 +- cinelerra-5.1/cinelerra/wwindow.C | 2 + cinelerra-5.1/configure.ac | 5 ++ cinelerra-5.1/guicast/bcfilebox.C | 2 + cinelerra-5.1/guicast/bcnewfolder.C | 2 + cinelerra-5.1/guicast/bcprogressbox.C | 4 +- cinelerra-5.1/guicast/bctrace.C | 15 ++++ cinelerra-5.1/guicast/bctrace.h | 6 ++ cinelerra-5.1/guicast/bcwindowbase.C | 9 +-- cinelerra-5.1/guicast/bcwindowdraw.C | 58 ++++++++-------- cinelerra-5.1/guicast/errorbox.C | 5 +- cinelerra-5.1/guicast/errorbox.h | 2 +- .../plugins/bluebanana/bluebananawindow.C | 1 + .../plugins/theme_blond/blondtheme.C | 19 ++++-- .../plugins/theme_blond/data/proxy_chkd.png | Bin 794 -> 0 bytes .../plugins/theme_blond/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_blond/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_blond/data/proxy_hi.png | Bin 814 -> 0 bytes .../plugins/theme_blond/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_blond/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../plugins/theme_blond/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_blond/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_blond/data/proxy_p_up.png | Bin 0 -> 461 bytes .../plugins/theme_blond/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../plugins/theme_blond/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_blond/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../plugins/theme_blond/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_blond/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_blond/data/proxy_s_up.png | Bin 0 -> 723 bytes .../plugins/theme_blond/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_blond/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_blond/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_blond_cv/blondcvtheme.C | 21 ++++-- .../theme_blond_cv/data/proxy_chkd.png | Bin 794 -> 0 bytes .../theme_blond_cv/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../theme_blond_cv/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_blond_cv/data/proxy_hi.png | Bin 814 -> 0 bytes .../theme_blond_cv/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_blond_cv/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../theme_blond_cv/data/proxy_p_down.png | Bin 0 -> 471 bytes .../theme_blond_cv/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../theme_blond_cv/data/proxy_p_up.png | Bin 0 -> 461 bytes .../theme_blond_cv/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../theme_blond_cv/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_blond_cv/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../theme_blond_cv/data/proxy_s_down.png | Bin 0 -> 740 bytes .../theme_blond_cv/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../theme_blond_cv/data/proxy_s_up.png | Bin 0 -> 723 bytes .../theme_blond_cv/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_blond_cv/data/proxy_up.png | Bin 589 -> 0 bytes .../theme_blond_cv/data/proxy_uphi.png | Bin 537 -> 0 bytes cinelerra-5.1/plugins/theme_blue/bluetheme.C | 19 ++++-- .../plugins/theme_blue/data/proxy_chkd.png | Bin 794 -> 0 bytes .../plugins/theme_blue/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_blue/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_blue/data/proxy_hi.png | Bin 814 -> 0 bytes .../plugins/theme_blue/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_blue/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../plugins/theme_blue/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_blue/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_blue/data/proxy_p_up.png | Bin 0 -> 461 bytes .../plugins/theme_blue/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../plugins/theme_blue/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_blue/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../plugins/theme_blue/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_blue/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_blue/data/proxy_s_up.png | Bin 0 -> 723 bytes .../plugins/theme_blue/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_blue/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_blue/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_blue_dot/bluedottheme.C | 21 ++++-- .../theme_blue_dot/data/proxy_chkd.png | Bin 794 -> 0 bytes .../theme_blue_dot/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../theme_blue_dot/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_blue_dot/data/proxy_hi.png | Bin 814 -> 0 bytes .../theme_blue_dot/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_blue_dot/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../theme_blue_dot/data/proxy_p_down.png | Bin 0 -> 471 bytes .../theme_blue_dot/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../theme_blue_dot/data/proxy_p_up.png | Bin 0 -> 461 bytes .../theme_blue_dot/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../theme_blue_dot/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_blue_dot/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../theme_blue_dot/data/proxy_s_down.png | Bin 0 -> 740 bytes .../theme_blue_dot/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../theme_blue_dot/data/proxy_s_up.png | Bin 0 -> 723 bytes .../theme_blue_dot/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_blue_dot/data/proxy_up.png | Bin 589 -> 0 bytes .../theme_blue_dot/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_bright/brighttheme.C | 19 ++++-- .../plugins/theme_bright/data/proxy_chkd.png | Bin 794 -> 0 bytes .../theme_bright/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_bright/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_bright/data/proxy_hi.png | Bin 814 -> 0 bytes .../theme_bright/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_bright/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../theme_bright/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_bright/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_bright/data/proxy_p_up.png | Bin 0 -> 461 bytes .../theme_bright/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../theme_bright/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_bright/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../theme_bright/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_bright/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_bright/data/proxy_s_up.png | Bin 0 -> 723 bytes .../theme_bright/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_bright/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_bright/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_hulk/data/proxy_chkd.png | Bin 794 -> 0 bytes .../plugins/theme_hulk/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_hulk/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_hulk/data/proxy_hi.png | Bin 814 -> 0 bytes .../plugins/theme_hulk/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_hulk/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../plugins/theme_hulk/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_hulk/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_hulk/data/proxy_p_up.png | Bin 0 -> 461 bytes .../plugins/theme_hulk/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../plugins/theme_hulk/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_hulk/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../plugins/theme_hulk/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_hulk/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_hulk/data/proxy_s_up.png | Bin 0 -> 723 bytes .../plugins/theme_hulk/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_hulk/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_hulk/data/proxy_uphi.png | Bin 537 -> 0 bytes cinelerra-5.1/plugins/theme_hulk/hulktheme.C | 19 ++++-- .../theme_pinklady/data/proxy_chkd.png | Bin 794 -> 0 bytes .../theme_pinklady/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../theme_pinklady/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_pinklady/data/proxy_hi.png | Bin 814 -> 0 bytes .../theme_pinklady/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_pinklady/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../theme_pinklady/data/proxy_p_down.png | Bin 0 -> 471 bytes .../theme_pinklady/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../theme_pinklady/data/proxy_p_up.png | Bin 0 -> 461 bytes .../theme_pinklady/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../theme_pinklady/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_pinklady/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../theme_pinklady/data/proxy_s_down.png | Bin 0 -> 740 bytes .../theme_pinklady/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../theme_pinklady/data/proxy_s_up.png | Bin 0 -> 723 bytes .../theme_pinklady/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_pinklady/data/proxy_up.png | Bin 589 -> 0 bytes .../theme_pinklady/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_pinklady/pinkladytheme.C | 19 ++++-- .../plugins/theme_suv/data/proxy_chkd.png | Bin 794 -> 0 bytes .../plugins/theme_suv/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_suv/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_suv/data/proxy_hi.png | Bin 814 -> 0 bytes .../plugins/theme_suv/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../plugins/theme_suv/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../plugins/theme_suv/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_suv/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_suv/data/proxy_p_up.png | Bin 0 -> 461 bytes .../plugins/theme_suv/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../plugins/theme_suv/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../plugins/theme_suv/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../plugins/theme_suv/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_suv/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_suv/data/proxy_s_up.png | Bin 0 -> 723 bytes .../plugins/theme_suv/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_suv/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_suv/data/proxy_uphi.png | Bin 537 -> 0 bytes cinelerra-5.1/plugins/theme_suv/suv.C | 19 ++++-- .../plugins/theme_unflat/data/proxy_chkd.png | Bin 794 -> 0 bytes .../theme_unflat/data/proxy_chkdhi.png | Bin 787 -> 0 bytes .../plugins/theme_unflat/data/proxy_down.png | Bin 473 -> 0 bytes .../plugins/theme_unflat/data/proxy_hi.png | Bin 814 -> 0 bytes .../theme_unflat/data/proxy_p_chkd.png | Bin 0 -> 680 bytes .../theme_unflat/data/proxy_p_chkdhi.png | Bin 0 -> 367 bytes .../theme_unflat/data/proxy_p_down.png | Bin 0 -> 471 bytes .../plugins/theme_unflat/data/proxy_p_hi.png | Bin 0 -> 471 bytes .../plugins/theme_unflat/data/proxy_p_up.png | Bin 0 -> 461 bytes .../theme_unflat/data/proxy_p_uphi.png | Bin 0 -> 444 bytes .../theme_unflat/data/proxy_s_chkd.png | Bin 0 -> 933 bytes .../theme_unflat/data/proxy_s_chkdhi.png | Bin 0 -> 559 bytes .../theme_unflat/data/proxy_s_down.png | Bin 0 -> 740 bytes .../plugins/theme_unflat/data/proxy_s_hi.png | Bin 0 -> 696 bytes .../plugins/theme_unflat/data/proxy_s_up.png | Bin 0 -> 723 bytes .../theme_unflat/data/proxy_s_uphi.png | Bin 0 -> 649 bytes .../plugins/theme_unflat/data/proxy_up.png | Bin 589 -> 0 bytes .../plugins/theme_unflat/data/proxy_uphi.png | Bin 537 -> 0 bytes .../plugins/theme_unflat/unflattheme.C | 19 ++++-- 241 files changed, 417 insertions(+), 417 deletions(-) delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_chkd.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_down.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_down.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_up.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_p_uphi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkd.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkdhi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_hi.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_up.png create mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_up.png delete mode 100644 cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png diff --git a/cinelerra-5.1/cinelerra/aboutprefs.C b/cinelerra-5.1/cinelerra/aboutprefs.C index 5f286aef..d07ce4de 100644 --- a/cinelerra-5.1/cinelerra/aboutprefs.C +++ b/cinelerra-5.1/cinelerra/aboutprefs.C @@ -45,6 +45,7 @@ AboutPrefs::~AboutPrefs() void AboutPrefs::create_objects() { + lock_window("AboutPrefs::create_objects"); int x, y; @@ -147,6 +148,7 @@ void AboutPrefs::create_objects() flash(); flush(); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index f4fe0c3a..4b42feff 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -72,7 +72,6 @@ int Asset::init_values() path[0] = 0; // Has to be unknown for file probing to succeed format = FILE_UNKNOWN; - fformat[0] = 0; bits = 0; byte_order = 0; signed_ = 0; @@ -84,6 +83,7 @@ int Asset::init_values() strcpy(vcodec, ""); strcpy(acodec, ""); + strcpy(fformat,"mp4"); ff_audio_options[0] = 0; ff_sample_format[0] = 0; ff_audio_bitrate = 0; diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C index 301cf482..ad809f61 100644 --- a/cinelerra-5.1/cinelerra/assetedit.C +++ b/cinelerra-5.1/cinelerra/assetedit.C @@ -937,10 +937,12 @@ void DetailAssetWindow::create_objects() break; } } + lock_window("DetailAssetWindow::create_objects"); text = new BC_ScrollTextBox(this, x, y, get_w()-32, 23, info, -len); text->create_objects(); text->set_text_row(0); add_subwindow(new BC_OKButton(this)); show_window(); + unlock_window(); } void DetailAssetDialog::start(Asset *asset, int x, int y) diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C index 059e5850..59357d18 100644 --- a/cinelerra-5.1/cinelerra/assetpopup.C +++ b/cinelerra-5.1/cinelerra/assetpopup.C @@ -580,6 +580,7 @@ AssetCopyWindow::~AssetCopyWindow() void AssetCopyWindow::create_objects() { + lock_window("AssetCopyWindow::create_objects"); BC_Title *title; int x = 10, y = 10, pad = 5; add_subwindow(title = new BC_Title(x, y, _("List of asset paths:"))); @@ -594,6 +595,7 @@ void AssetCopyWindow::create_objects() add_subwindow(new BC_OKButton(this)); show_window(); + unlock_window(); } int AssetCopyWindow::resize_event(int w, int h) @@ -705,6 +707,7 @@ AssetPasteWindow::~AssetPasteWindow() void AssetPasteWindow::create_objects() { + lock_window("AssetPasteWindow::create_objects()"); BC_Title *title; int x = 10, y = 10, pad = 5; add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:"))); @@ -717,6 +720,7 @@ void AssetPasteWindow::create_objects() add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); show_window(); + unlock_window(); } int AssetPasteWindow::resize_event(int w, int h) diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index bffaa2d1..7ea4759f 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -651,7 +651,6 @@ void AssetPicon::create_objects() open_render_engine(edl, 0); render_video(0, gui->temp_picon); close_render_engine(); - gui->lock_window("AssetPicon::create_objects 0"); icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); icon_vframe->transfer_from(gui->temp_picon); @@ -661,6 +660,7 @@ void AssetPicon::create_objects() pixmap_w = icon_vframe->get_w(); pixmap_h = icon_vframe->get_h(); } + gui->lock_window("AssetPicon::create_objects 0"); icon = new BC_Pixmap(gui, pixmap_w, pixmap_h); icon->draw_vframe(icon_vframe, 0, 0, pixmap_w, pixmap_h, 0, 0); @@ -1209,6 +1209,7 @@ AWindowRemovePluginGUI:: void AWindowRemovePluginGUI::create_objects() { + lock_window("AWindowRemovePluginGUI::create_objects"); BC_Button *ok_button = new BC_OKButton(this); add_subwindow(ok_button); BC_Button *cancel_button = new BC_CancelButton(this); @@ -1222,6 +1223,7 @@ void AWindowRemovePluginGUI::create_objects() 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); add_subwindow(list); show_window(); + unlock_window(); } int AWindowRemovePlugin::remove_plugin(PluginServer *plugin, ArrayList &folder) diff --git a/cinelerra-5.1/cinelerra/channeledit.C b/cinelerra-5.1/cinelerra/channeledit.C index f85cd285..9a81984e 100644 --- a/cinelerra-5.1/cinelerra/channeledit.C +++ b/cinelerra-5.1/cinelerra/channeledit.C @@ -186,6 +186,7 @@ ChannelEditWindow::~ChannelEditWindow() void ChannelEditWindow::create_objects() { + lock_window("ChannelEditWindow::create_objects"); int x = 10, y = 10; // Create channel list @@ -231,6 +232,7 @@ void ChannelEditWindow::create_objects() edit_thread = new ChannelEditEditThread(this, channel_picker); picture_thread = new ChannelEditPictureThread(channel_picker); show_window(); + unlock_window(); } int ChannelEditWindow::close_event() @@ -627,36 +629,19 @@ int ChannelEditPicture::handle_event() } - - - - - - - - - - -// ========================= confirm overwrite by channel scannin - +// ========================= confirm overwrite by channel scanning ConfirmScan::ConfirmScan(ChannelEditWindow *gui, int x, int y) : BC_Window(_(PROGRAM_NAME ": Scan confirm"), - x, - y, - 350, - BC_OKButton::calculate_h() + 130, - 0, - 0, - 0, - 0, - 1) + x, y, 350, BC_OKButton::calculate_h() + 130, + 0, 0, 0, 0, 1) { this->gui = gui; } void ConfirmScan::create_objects() { + lock_window("ConfirmScan::create_objects"); int x = 10, y = 10; int y2 = 0, x2 = 0; BC_Title *title; @@ -704,14 +689,9 @@ void ConfirmScan::create_objects() add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); show_window(); + unlock_window(); } - - - - - - ConfirmScanThread::ConfirmScanThread(ChannelEditWindow *gui) : BC_DialogThread() { @@ -996,13 +976,7 @@ ChannelEditEditWindow::ChannelEditEditWindow(ChannelEditEditThread *thread, : BC_Window(_(PROGRAM_NAME ": Edit Channel"), channel_picker->parent_window->get_abs_cursor_x(1), channel_picker->parent_window->get_abs_cursor_y(1), - 390, - 300, - 390, - 300, - 0, - 0, - 1) + 390, 300, 390, 300, 0, 0, 1) { this->channel_picker = channel_picker; this->window = window; @@ -1011,8 +985,10 @@ ChannelEditEditWindow::ChannelEditEditWindow(ChannelEditEditThread *thread, ChannelEditEditWindow::~ChannelEditEditWindow() { } + void ChannelEditEditWindow::create_objects(Channel *channel) { + lock_window("ChannelEditEditWindow::create_objects"); this->new_channel = channel; Channel *channel_usage = channel_picker->get_channel_usage(); title_text = 0; @@ -1088,6 +1064,7 @@ void ChannelEditEditWindow::create_objects(Channel *channel) x += 200; add_subwindow(new BC_CancelButton(this)); show_window(); + unlock_window(); } ChannelEditEditTitle::ChannelEditEditTitle(int x, @@ -1392,10 +1369,8 @@ ChannelEditPictureWindow::ChannelEditPictureWindow(ChannelEditPictureThread *thr : BC_Window(_(PROGRAM_NAME ": Picture"), channel_picker->mwindow->session->picture_x, channel_picker->mwindow->session->picture_y, - calculate_w(channel_picker), - calculate_h(channel_picker), - calculate_w(channel_picker), - calculate_h(channel_picker)) + calculate_w(channel_picker), calculate_h(channel_picker), + calculate_w(channel_picker), calculate_h(channel_picker)) { this->thread = thread; this->channel_picker = channel_picker; @@ -1504,6 +1479,7 @@ int ChannelEditPictureWindow::calculate_w(ChannelPicker *channel_picker) void ChannelEditPictureWindow::create_objects() { + lock_window("ChannelEditPictureWindow::create_objects"); int x = 10, y = 10; int widget_border = ((Theme*)channel_picker->get_theme())->widget_border; int x1 = get_w() - BC_Pot::calculate_w() * 2 - widget_border * 2; @@ -1592,6 +1568,7 @@ void ChannelEditPictureWindow::create_objects() y += pad; add_subwindow(new BC_OKButton(this)); show_window(); + unlock_window(); } int ChannelEditPictureWindow::translation_event() diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C index 3d1fa69f..177f2840 100644 --- a/cinelerra-5.1/cinelerra/channelinfo.C +++ b/cinelerra-5.1/cinelerra/channelinfo.C @@ -259,6 +259,7 @@ int ChanSearchList::move_column_event() void ChanSearchGUI::create_objects() { + lock_window("ChanSearchGUI::create_objects"); int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5; int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT); int x = padx/2, y = pady/4; @@ -301,6 +302,7 @@ void ChanSearchGUI::create_objects() set_icon(iwindow->mwindow->theme->get_image("record_icon")); search_text->activate(); + unlock_window(); } ChanSearchGUI::ChanSearchGUI(ChanSearch *cswindow) @@ -1283,6 +1285,7 @@ int ChannelInfoGUIBatches::handle_event() void ChannelInfoGUI::create_objects() { + lock_window("ChannelInfoGUI::create_objects"); panel = new ChannelPanel(this,0,0,panel_w,panel_h); add_subwindow(panel); panel->create_objects(); @@ -1373,6 +1376,7 @@ void ChannelInfoGUI::create_objects() channel_search = new ChanSearch(iwindow); show_window(); + unlock_window(); } ChannelInfoGUI::ChannelInfoGUI(ChannelInfo *iwindow, diff --git a/cinelerra-5.1/cinelerra/cropvideo.C b/cinelerra-5.1/cinelerra/cropvideo.C index a1df4ff9..f1c2abf5 100644 --- a/cinelerra-5.1/cinelerra/cropvideo.C +++ b/cinelerra-5.1/cinelerra/cropvideo.C @@ -106,13 +106,13 @@ CropVideoWindow::~CropVideoWindow() void CropVideoWindow::create_objects() { + lock_window("CropVideoWindow::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, _("Select a region to crop in the video output window"))); y += 30; add_subwindow(new BC_OKButton(x, y)); x = get_w() - 100; add_subwindow(new BC_CancelButton(x, y)); + unlock_window(); } - - diff --git a/cinelerra-5.1/cinelerra/deleteallindexes.C b/cinelerra-5.1/cinelerra/deleteallindexes.C index 15aa857e..c600a455 100644 --- a/cinelerra-5.1/cinelerra/deleteallindexes.C +++ b/cinelerra-5.1/cinelerra/deleteallindexes.C @@ -89,6 +89,7 @@ ConfirmDeleteAllIndexes::~ConfirmDeleteAllIndexes() void ConfirmDeleteAllIndexes::create_objects() { + lock_window("ConfirmDeleteAllIndexes::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, string)); @@ -96,6 +97,7 @@ void ConfirmDeleteAllIndexes::create_objects() add_subwindow(new BC_OKButton(x, y)); x = get_w() - 100; add_subwindow(new BC_CancelButton(x, y)); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index 694c2d2a..e8d27b96 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -295,6 +295,7 @@ int EditPopupTitleWindow::close_event() void EditPopupTitleWindow::create_objects() { + lock_window("EditPopupTitleWindow::create_objects"); int x = 5; int y = 10; @@ -307,6 +308,7 @@ void EditPopupTitleWindow::create_objects() show_window(); flush(); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/effectlist.C b/cinelerra-5.1/cinelerra/effectlist.C index 2f9a5dba..25e7c8c3 100644 --- a/cinelerra-5.1/cinelerra/effectlist.C +++ b/cinelerra-5.1/cinelerra/effectlist.C @@ -86,6 +86,7 @@ EffectTipWindow::~EffectTipWindow() void EffectTipWindow::create_objects() { + lock_window("EffectTipWindow::create_objects"); int x = 10, y = 10; BC_Title *title; add_subwindow(title = new BC_Title(x, y, thread->effect)); @@ -93,7 +94,8 @@ void EffectTipWindow::create_objects() add_subwindow(tip_text = new BC_Title(x+5, y, thread->text)); add_subwindow(new BC_OKButton(this)); show_window(1); -}; + unlock_window(); +} EffectTipItem::EffectTipItem(AWindowGUI *gui) : BC_MenuItem(_("Info")) diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C index 8cbbbf3f..73e51cf1 100644 --- a/cinelerra-5.1/cinelerra/exportedl.C +++ b/cinelerra-5.1/cinelerra/exportedl.C @@ -26,12 +26,12 @@ #include "edits.h" #include "edl.h" #include "edlsession.h" -#include "errorbox.h" #include "file.h" #include "filesystem.h" #include "filexml.h" #include "language.h" #include "localsession.h" +#include "mainerror.h" #include "mainsession.h" #include "mutex.h" #include "mwindowgui.h" @@ -113,6 +113,10 @@ void ExportEDLAsset::export_it() { FILE *fh; fh = fopen(path, "w+"); + if( !fh ) { + eprintf("unable to open file: %s", path); + return; + } // We currently only support exporting one track at a time // Find the track... @@ -362,6 +366,7 @@ ExportEDLWindow::~ExportEDLWindow() void ExportEDLWindow::create_objects() { + lock_window("ExportEDLWindow::create_objects"); int x = 5, y = 5; add_subwindow(new BC_Title(x, y, _("Select a file to export to:"))); @@ -418,6 +423,7 @@ void ExportEDLWindow::create_objects() add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); show_window(); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/featheredits.C b/cinelerra-5.1/cinelerra/featheredits.C index 55364007..6c0c67df 100644 --- a/cinelerra-5.1/cinelerra/featheredits.C +++ b/cinelerra-5.1/cinelerra/featheredits.C @@ -91,6 +91,7 @@ FeatherEditsWindow::~FeatherEditsWindow() int FeatherEditsWindow::create_objects(int audio, int video) { + lock_window("FeatherEditsWindow::create_objects"); int x = 10; int y = 10; this->audio = audio; @@ -110,6 +111,7 @@ int FeatherEditsWindow::create_objects(int audio, int video) add_subwindow(new BC_OKButton(x, y)); add_subwindow(new BC_CancelButton(x, y)); return 0; + unlock_window(); } FeatherEditsTextBox::FeatherEditsTextBox(FeatherEditsWindow *window, char *text, int x, int y) diff --git a/cinelerra-5.1/cinelerra/filedv.C b/cinelerra-5.1/cinelerra/filedv.C index 1a543744..bcce24b2 100644 --- a/cinelerra-5.1/cinelerra/filedv.C +++ b/cinelerra-5.1/cinelerra/filedv.C @@ -982,8 +982,7 @@ DVConfigAudio::DVConfigAudio(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Audio Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 350, - 250) + 350, 250) { this->parent_window = parent_window; this->asset = asset; @@ -996,8 +995,10 @@ DVConfigAudio::~DVConfigAudio() void DVConfigAudio::create_objects() { + lock_window("DVConfigAudio::create_objects"); add_tool(new BC_Title(10, 10, _("There are no audio options for this format"))); add_subwindow(new BC_OKButton(this)); + unlock_window(); } int DVConfigAudio::close_event() @@ -1007,16 +1008,11 @@ int DVConfigAudio::close_event() } - - - - DVConfigVideo::DVConfigVideo(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Video Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 350, - 250) + 350, 250) { this->parent_window = parent_window; this->asset = asset; @@ -1029,8 +1025,10 @@ DVConfigVideo::~DVConfigVideo() void DVConfigVideo::create_objects() { + lock_window("DVConfigVideo::create_objects"); add_tool(new BC_Title(10, 10, _("There are no video options for this format"))); add_subwindow(new BC_OKButton(this)); + unlock_window(); } int DVConfigVideo::close_event() diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index 7edc387d..5910dd20 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -1467,6 +1467,7 @@ FFOptionsWindow::~FFOptionsWindow() void FFOptionsWindow::create_objects() { + lock_window("FFOptionsWindow::create_objects"); BC_Title *title; int x0 = 10, y0 = 10; int x = x0, y = y0; @@ -1512,6 +1513,7 @@ void FFOptionsWindow::create_objects() options.initialize(this, FF_KIND_CODEC); draw(); show_window(1); + unlock_window(); } void FFOptionsWindow::draw() diff --git a/cinelerra-5.1/cinelerra/fileformat.C b/cinelerra-5.1/cinelerra/fileformat.C index 11c6a310..a8ff043c 100644 --- a/cinelerra-5.1/cinelerra/fileformat.C +++ b/cinelerra-5.1/cinelerra/fileformat.C @@ -87,15 +87,8 @@ void FileFormat::create_objects_(char *string2) y += 30; add_subwindow(new BC_Title(x, y, _("Bits:"))); - bitspopup = new BitsPopup(this, - x2, - y, - &asset->bits, - 0, - 1, - 1, - 0, - 1); + bitspopup = new BitsPopup(this, x2, y, + &asset->bits, 0, 1, 1, 0, 1); bitspopup->create_objects(); y += 30; @@ -121,13 +114,7 @@ void FileFormat::create_objects_(char *string2) } FileFormatChannels::FileFormatChannels(int x, int y, FileFormat *fwindow, char *text) - : BC_TumbleTextBox(fwindow, - (int)atol(text), - (int)1, - (int)MAXCHANNELS, - x, - y, - 50) + : BC_TumbleTextBox(fwindow, (int)atol(text), (int)1, (int)MAXCHANNELS, x, y, 50) { this->fwindow = fwindow; } diff --git a/cinelerra-5.1/cinelerra/filejpeg.C b/cinelerra-5.1/cinelerra/filejpeg.C index 8c5687cc..d35e9bd4 100644 --- a/cinelerra-5.1/cinelerra/filejpeg.C +++ b/cinelerra-5.1/cinelerra/filejpeg.C @@ -345,8 +345,7 @@ JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Video Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 400, - 200) + 400, 200) { this->parent_window = parent_window; this->asset = asset; diff --git a/cinelerra-5.1/cinelerra/filejpeglist.C b/cinelerra-5.1/cinelerra/filejpeglist.C index b7755996..d1c7ba9f 100644 --- a/cinelerra-5.1/cinelerra/filejpeglist.C +++ b/cinelerra-5.1/cinelerra/filejpeglist.C @@ -100,19 +100,11 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data) { PRINT_TRACE - mjpeg_t *mjpeg = mjpeg_new(asset->width, - asset->height, - 1); - mjpeg_decompress(mjpeg, - data->get_data(), - data->get_compressed_size(), - 0, - frame->get_rows(), - frame->get_y(), - frame->get_u(), - frame->get_v(), - frame->get_color_model(), - file->cpus); + mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1); + mjpeg_decompress(mjpeg, data->get_data(), data->get_compressed_size(), + 0, frame->get_rows(), + frame->get_y(), frame->get_u(), frame->get_v(), + frame->get_color_model(), file->cpus); mjpeg_delete(mjpeg); PRINT_TRACE return 0; @@ -120,16 +112,10 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data) int FileJPEGList::write_frame(VFrame *frame, VFrame *data) { - mjpeg_t *mjpeg = mjpeg_new(asset->width, - asset->height, - 1); - mjpeg_compress(mjpeg, - frame->get_rows(), - frame->get_y(), - frame->get_u(), - frame->get_v(), - frame->get_color_model(), - file->cpus); + mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1); + mjpeg_compress(mjpeg, frame->get_rows(), + frame->get_y(), frame->get_u(), frame->get_v(), + frame->get_color_model(), file->cpus); data->allocate_compressed_data(mjpeg_output_size(mjpeg)); bcopy(mjpeg_output_buffer(mjpeg), frame->get_data(), mjpeg_output_size(mjpeg)); mjpeg_delete(mjpeg); @@ -137,21 +123,11 @@ int FileJPEGList::write_frame(VFrame *frame, VFrame *data) } - - - - - - - - - JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Video Compression"), parent_window->get_abs_cursor_x(), parent_window->get_abs_cursor_y(), - 400, - 100) + 400, 100) { this->parent_window = parent_window; this->asset = asset; @@ -166,17 +142,9 @@ void JPEGConfigVideo::create_objects() int x = 10, y = 10; lock_window("JPEGConfigVideo::create_objects"); add_subwindow(new BC_Title(x, y, _("Quality:"))); - add_subwindow(new BC_ISlider(x + 80, - y, - 0, - 200, - 200, - 0, - 100, - asset->quality, - 0, - 0, - &asset->quality)); + add_subwindow(new BC_ISlider(x + 80, y, 0, + 200, 200, 0, 100, asset->quality, + 0, 0, &asset->quality)); add_subwindow(new BC_OKButton(this)); unlock_window(); @@ -188,9 +156,3 @@ int JPEGConfigVideo::close_event() return 1; } - - - - - - diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C index da71349e..6c889b92 100644 --- a/cinelerra-5.1/cinelerra/filempeg.C +++ b/cinelerra-5.1/cinelerra/filempeg.C @@ -1726,13 +1726,7 @@ MPEGConfigAudio::MPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Audio Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 310, - 120, - -1, - -1, - 0, - 0, - 1) + 310, 120, -1, -1, 0, 0, 1) { this->parent_window = parent_window; this->asset = asset; @@ -1779,11 +1773,6 @@ int MPEGConfigAudio::close_event() } - - - - - MPEGLayer::MPEGLayer(int x, int y, MPEGConfigAudio *gui) : BC_PopupMenu(x, y, 100, layer_to_string(gui->asset->ampeg_derivative)) { @@ -1838,9 +1827,7 @@ char* MPEGLayer::layer_to_string(int layer) MPEGABitrate::MPEGABitrate(int x, int y, MPEGConfigAudio *gui) - : BC_PopupMenu(x, - y, - 100, + : BC_PopupMenu(x, y, 100, bitrate_to_string(gui->string, gui->asset->ampeg_bitrate)) { this->gui = gui; @@ -1918,13 +1905,7 @@ MPEGConfigVideo::MPEGConfigVideo(BC_WindowBase *parent_window, : BC_Window(_(PROGRAM_NAME ": Video Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 500, - 400, - -1, - -1, - 0, - 0, - 1) + 500, 400, -1, -1, 0, 0, 1) { this->parent_window = parent_window; this->asset = asset; diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C index b413066d..99995fe9 100644 --- a/cinelerra-5.1/cinelerra/fileogg.C +++ b/cinelerra-5.1/cinelerra/fileogg.C @@ -2003,8 +2003,7 @@ OGGConfigAudio::OGGConfigAudio(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Audio Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 350, - 250) + 350, 250) { this->parent_window = parent_window; this->asset = asset; @@ -2130,8 +2129,7 @@ OGGConfigVideo::OGGConfigVideo(BC_WindowBase *parent_window, Asset *asset) : BC_Window(_(PROGRAM_NAME ": Video Compression"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), - 450, - 220) + 450, 220) { this->parent_window = parent_window; this->asset = asset; @@ -2156,18 +2154,10 @@ void OGGConfigVideo::create_objects() y += 30; add_subwindow(new BC_Title(x, y, _("Quality:"))); - add_subwindow(new BC_ISlider(x + 80, - y, - 0, - 200, - 200, - 0, - 63, - asset->theora_quality, - 0, - 0, - &asset->theora_quality)); - + add_subwindow(new BC_ISlider(x + 80, y, 0, + 200, 200, 0, 63, + asset->theora_quality, 0, + 0, &asset->theora_quality)); add_subwindow(fixed_quality = new OGGTheoraFixedQuality(x2, y, this)); y += 30; @@ -2197,8 +2187,6 @@ void OGGConfigVideo::create_objects() } - - int OGGConfigVideo::close_event() { set_done(0); diff --git a/cinelerra-5.1/cinelerra/filepng.C b/cinelerra-5.1/cinelerra/filepng.C index 68ce488c..d4b581d7 100644 --- a/cinelerra-5.1/cinelerra/filepng.C +++ b/cinelerra-5.1/cinelerra/filepng.C @@ -382,7 +382,7 @@ PNGConfigVideo::~PNGConfigVideo() void PNGConfigVideo::create_objects() { - lock_window("PNGConfigVideo::create_objects()"); + lock_window("PNGConfigVideo::create_objects"); int x = 10, y = 10; add_subwindow(new PNGUseAlpha(this, x, y)); add_subwindow(new BC_OKButton(this)); diff --git a/cinelerra-5.1/cinelerra/fileppm.C b/cinelerra-5.1/cinelerra/fileppm.C index f8dc0415..7df92707 100644 --- a/cinelerra-5.1/cinelerra/fileppm.C +++ b/cinelerra-5.1/cinelerra/fileppm.C @@ -199,7 +199,11 @@ PPMConfigVideo::PPMConfigVideo(BC_WindowBase *gui, Asset *asset) { this->gui = gui; this->asset = asset; - lock_window("PPMConfigVideo::create_objects()"); +} + +void PPMConfigVideo::create_objects() +{ + lock_window("PPMConfigVideo::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, _("PPM, RGB raw only"))); add_subwindow(new BC_OKButton(this)); @@ -213,6 +217,7 @@ void FilePPM::get_parameters(BC_WindowBase *parent_window, { if(video_options) { PPMConfigVideo *window = new PPMConfigVideo(parent_window, asset); + window->create_objects(); format_window = window; window->run_window(); delete window; diff --git a/cinelerra-5.1/cinelerra/fileppm.h b/cinelerra-5.1/cinelerra/fileppm.h index db476971..ec6a094a 100644 --- a/cinelerra-5.1/cinelerra/fileppm.h +++ b/cinelerra-5.1/cinelerra/fileppm.h @@ -53,6 +53,7 @@ class PPMConfigVideo : public BC_Window { public: PPMConfigVideo(BC_WindowBase *gui, Asset *asset); + void create_objects(); BC_WindowBase *gui; Asset *asset; diff --git a/cinelerra-5.1/cinelerra/filesndfile.C b/cinelerra-5.1/cinelerra/filesndfile.C index f3370e16..9351378b 100644 --- a/cinelerra-5.1/cinelerra/filesndfile.C +++ b/cinelerra-5.1/cinelerra/filesndfile.C @@ -392,7 +392,7 @@ SndFileConfig::~SndFileConfig() void SndFileConfig::create_objects() { - lock_window("SndFileConfig::create_objects()"); + lock_window("SndFileConfig::create_objects"); int x = 10, y = 10; bits_popup = 0; diff --git a/cinelerra-5.1/cinelerra/filetga.C b/cinelerra-5.1/cinelerra/filetga.C index 21c53d1d..800661e4 100644 --- a/cinelerra-5.1/cinelerra/filetga.C +++ b/cinelerra-5.1/cinelerra/filetga.C @@ -919,7 +919,7 @@ TGAConfigVideo::~TGAConfigVideo() void TGAConfigVideo::create_objects() { - lock_window("TGAConfigVideo::create_objects()"); + lock_window("TGAConfigVideo::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, _("Compression:"))); diff --git a/cinelerra-5.1/cinelerra/filetiff.C b/cinelerra-5.1/cinelerra/filetiff.C index 5621f0e3..fb1449f1 100644 --- a/cinelerra-5.1/cinelerra/filetiff.C +++ b/cinelerra-5.1/cinelerra/filetiff.C @@ -599,7 +599,7 @@ TIFFConfigVideo::~TIFFConfigVideo() void TIFFConfigVideo::create_objects() { - lock_window("TIFFConfigVideo::create_objects()"); + lock_window("TIFFConfigVideo::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, _("Colorspace:"))); diff --git a/cinelerra-5.1/cinelerra/formatwindow.C b/cinelerra-5.1/cinelerra/formatwindow.C index 73694876..a2c1ba36 100644 --- a/cinelerra-5.1/cinelerra/formatwindow.C +++ b/cinelerra-5.1/cinelerra/formatwindow.C @@ -37,6 +37,7 @@ FormatAWindow::~FormatAWindow() void FormatAWindow::create_objects() { + lock_window("FormatAWindow::create_objects"); int x; int init_x; int y = 10; @@ -75,6 +76,7 @@ void FormatAWindow::create_objects() x = init_x; add_subwindow(new BC_OKButton(x + 170, y)); + unlock_window(); } @@ -85,7 +87,6 @@ int FormatAWindow::close_event() - FormatVWindow::FormatVWindow(Asset *asset, int recording) : BC_Window(_(PROGRAM_NAME ": File format"), 410, 115, 0, 0) { this->asset = asset; this->recording = recording; } @@ -96,6 +97,7 @@ FormatVWindow::~FormatVWindow() void FormatVWindow::create_objects() { + lock_window("FormatVWindow::create_objects"); int x, y = 10; int init_x; @@ -118,6 +120,7 @@ void FormatVWindow::create_objects() } add_subwindow(new BC_OKButton(x + 170, y)); + unlock_window(); } int FormatVWindow::close_event() @@ -126,21 +129,8 @@ int FormatVWindow::close_event() } - - - - - FormatQuality::FormatQuality(int x, int y, Asset *asset, int default_) - : BC_ISlider(x, - y, - 0, - 100, - 100, - 0, - 100, - default_, - 1) + : BC_ISlider(x, y, 0, 100, 100, 0, 100, default_, 1) { this->asset = asset; } @@ -153,7 +143,6 @@ int FormatQuality::handle_event() } - FormatBits::FormatBits(int x, int y, Asset *asset) : BitsPopup(x, y, asset) { this->asset = asset; } @@ -164,7 +153,6 @@ int FormatBits::handle_event() } - FormatDither::FormatDither(int x, int y, int *dither) : BC_CheckBox(x, y, *dither, _("Dither")) { this->dither = dither; } @@ -187,10 +175,6 @@ int FormatSigned::handle_event() } - - - - FormatHILO::FormatHILO(int x, int y, Asset *asset) : BC_Radial(x, y, asset->byte_order ^ 1) { diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C index d7f639ed..97a9adc2 100644 --- a/cinelerra-5.1/cinelerra/gwindowgui.C +++ b/cinelerra-5.1/cinelerra/gwindowgui.C @@ -353,7 +353,7 @@ int GWindowColorButton::handle_event() void GWindowGUI::create_objects() { int x = 10, y = 10; - lock_window("GWindowGUI::create_objects 1"); + lock_window("GWindowGUI::create_objects"); for( int i=0; i<(int)(sizeof(toggle_order)/sizeof(toggle_order[0])); ++i ) { toggleinfo *tp = &toggle_order[i]; diff --git a/cinelerra-5.1/cinelerra/labeledit.C b/cinelerra-5.1/cinelerra/labeledit.C index a2bd71f4..22c5252a 100644 --- a/cinelerra-5.1/cinelerra/labeledit.C +++ b/cinelerra-5.1/cinelerra/labeledit.C @@ -86,6 +86,7 @@ LabelEditWindow::~LabelEditWindow() void LabelEditWindow::create_objects() { + lock_window("LabelEditWindow::create_objects"); this->label = thread->label; int x = 10, y = 10; @@ -102,6 +103,7 @@ void LabelEditWindow::create_objects() add_subwindow(new BC_CancelButton(this)); show_window(); textbox->activate(); + unlock_window(); } LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int w, int rows) diff --git a/cinelerra-5.1/cinelerra/mainerror.C b/cinelerra-5.1/cinelerra/mainerror.C index eec7f8a1..61ffa7c4 100644 --- a/cinelerra-5.1/cinelerra/mainerror.C +++ b/cinelerra-5.1/cinelerra/mainerror.C @@ -64,27 +64,26 @@ MainErrorGUI::~MainErrorGUI() void MainErrorGUI::create_objects() { - + lock_window("MainErrorGUI::create_objects"); BC_Button *button; add_subwindow(button = new BC_OKButton(this)); int x = 10, y = 10; add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:"))); y += title->get_h() + 5; - add_subwindow(list = new BC_ListBox(x, - y, - get_w() - 20, - button->get_y() - y - 5, - LISTBOX_TEXT, // Display text list or icons - &thread->errors, // Each column has an ArrayList of BC_ListBoxItems. - 0, // Titles for columns. Set to 0 for no titles - 0, // width of each column - 1, // Total columns. Only 1 in icon mode - 0, // Pixel of top of window. - 0, // If this listbox is a popup window with a button - LISTBOX_SINGLE, // Select one item or multiple items - ICON_LEFT, // Position of icon relative to text of each item + add_subwindow(list = new BC_ListBox(x, y, + get_w() - 20, button->get_y() - y - 5, + LISTBOX_TEXT, // Display text list or icons + &thread->errors, // Each column has an ArrayList of BC_ListBoxItems. + 0, // Titles for columns. Set to 0 for no titles + 0, // width of each column + 1, // Total columns. Only 1 in icon mode + 0, // Pixel of top of window. + 0, // If this listbox is a popup window with a button + LISTBOX_SINGLE, // Select one item or multiple items + ICON_LEFT, // Position of icon relative to text of each item 0)); show_window(); + unlock_window(); } int MainErrorGUI::resize_event(int w, int h) diff --git a/cinelerra-5.1/cinelerra/manualgoto.C b/cinelerra-5.1/cinelerra/manualgoto.C index 6c1f715e..966def18 100644 --- a/cinelerra-5.1/cinelerra/manualgoto.C +++ b/cinelerra-5.1/cinelerra/manualgoto.C @@ -115,6 +115,7 @@ void ManualGotoWindow::update_position(double position) void ManualGotoWindow::create_objects() { + lock_window("ManualGotoWindow::create_objects"); int x = 76, y = 5; BC_Title *title = new BC_Title(x - 2, y, _("hour min sec msec"), SMALLFONT); @@ -134,6 +135,7 @@ void ManualGotoWindow::create_objects() add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C index 9b98c31f..92217a6b 100644 --- a/cinelerra-5.1/cinelerra/menueffects.C +++ b/cinelerra-5.1/cinelerra/menueffects.C @@ -746,9 +746,7 @@ MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow) MenuEffectPrompt::calculate_h(mwindow->gui), MenuEffectPrompt::calculate_w(mwindow->gui), MenuEffectPrompt::calculate_h(mwindow->gui), - 0, - 0, - 1) + 0, 0, 1) { } @@ -769,6 +767,7 @@ int MenuEffectPrompt::calculate_h(BC_WindowBase *gui) void MenuEffectPrompt::create_objects() { + lock_window("MenuEffectPrompt::create_objects"); int x = 10, y = 10; BC_Title *title; add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT)); @@ -776,5 +775,6 @@ void MenuEffectPrompt::create_objects() add_subwindow(new BC_CancelButton(this)); show_window(); raise_window(); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/meterpanel.C b/cinelerra-5.1/cinelerra/meterpanel.C index 76d1bb49..10e01ca0 100644 --- a/cinelerra-5.1/cinelerra/meterpanel.C +++ b/cinelerra-5.1/cinelerra/meterpanel.C @@ -251,10 +251,12 @@ void MeterPanel::update(double *levels) void MeterPanel::init_meters(int dmix) { + subwindow->lock_window("MeterPanel::init_meters"); for(int i = 0; i < meter_count; i++) { meters.values[i]->reset(dmix); } + subwindow->unlock_window(); } void MeterPanel::update_peak(int number, float value) diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index e81b4574..b0f829bb 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -1307,6 +1307,7 @@ void MWindow::stop_mixers() void MWindow::close_mixers(int destroy) { + ArrayList closed; zwindows_lock->lock("MWindow::close_mixers"); for( int i=zwindows.size(); --i>=0; ) { ZWindow *zwindow = zwindows[i]; @@ -1316,12 +1317,12 @@ void MWindow::close_mixers(int destroy) zgui->lock_window("MWindow::select_zwindow 0"); zgui->set_done(0); zgui->unlock_window(); + closed.append(zwindow); } zwindows_lock->unlock(); - for( int i=0; iidx < 0 ) continue; - zwindow->close_window(); + for( int i=0; ijoin(); } } @@ -1554,9 +1555,7 @@ void MWindow::init_indexes() void MWindow::init_gui() { gui = new MWindowGUI(this); - gui->lock_window("MWindow::init_gui"); gui->create_objects(); - gui->unlock_window(); gui->load_defaults(defaults); } @@ -2295,11 +2294,12 @@ int MWindow::enable_proxy() if( edl->session->proxy_scale == 1 && edl->session->proxy_disabled_scale != 1 ) { int new_scale = edl->session->proxy_disabled_scale; + int new_use_scaler = edl->session->proxy_use_scaler; edl->session->proxy_disabled_scale = 1; Asset *asset = new Asset; asset->format = FILE_FFMPEG; asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0); - ret = to_proxy(asset, new_scale); + ret = to_proxy(asset, new_scale, new_use_scaler); asset->remove_user(); if( ret > 0 ) beep(2000., 1.5, 0.5); @@ -2311,17 +2311,19 @@ int MWindow::disable_proxy() { if( edl->session->proxy_scale != 1 && edl->session->proxy_disabled_scale == 1 ) { + int new_scale = 1; + int new_use_scaler = edl->session->proxy_use_scaler; edl->session->proxy_disabled_scale = edl->session->proxy_scale; Asset *asset = new Asset; asset->format = FILE_FFMPEG; asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0); - to_proxy(asset, 1); + to_proxy(asset, new_scale, new_use_scaler); asset->remove_user(); } return 1; } -int MWindow::to_proxy(Asset *asset, int new_scale) +int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler) { ArrayList orig_idxbls; ArrayList proxy_assets; @@ -2334,7 +2336,6 @@ int MWindow::to_proxy(Asset *asset, int new_scale) // revert project to original size from current size // remove all session proxy assets at the at the current proxy_scale int proxy_scale = edl->session->proxy_scale; - int proxy_use_scaler = edl->session->proxy_use_scaler; if( proxy_scale > 1 ) { Asset *orig_asset = edl->assets->first; @@ -2439,7 +2440,7 @@ int MWindow::to_proxy(Asset *asset, int new_scale) result = proxy_render.create_needed_proxies(new_scale); if( !result ) // resize project - edl->set_proxy(new_scale, proxy_use_scaler, + edl->set_proxy(new_scale, new_use_scaler, &proxy_render.orig_idxbls, &proxy_render.orig_proxies); undo->update_undo_after(_("proxy"), LOAD_ALL); @@ -2550,14 +2551,14 @@ void MWindow::create_objects(int want_gui, check_language(); init_preferences(); if(splash_window) - splash_window->operation->update(_("Initializing Plugins")); + splash_window->update_status(_("Initializing Plugins")); init_plugins(this, preferences); if(debug) PRINT_TRACE init_ladspa_plugins(this, preferences); if(debug) PRINT_TRACE init_plugin_tips(*plugindb, cin_lang); if(splash_window) - splash_window->operation->update(_("Initializing GUI")); + splash_window->update_status(_("Initializing GUI")); if(debug) PRINT_TRACE init_theme(); @@ -2565,7 +2566,7 @@ void MWindow::create_objects(int want_gui, init_error(); if(splash_window) - splash_window->operation->update(_("Initializing Fonts")); + splash_window->update_status(_("Initializing Fonts")); char string[BCTEXTLEN]; strcpy(string, preferences->plugin_dir); strcat(string, "/" FONT_SEARCHPATH); diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h index 2ec30683..8053f0ee 100644 --- a/cinelerra-5.1/cinelerra/mwindow.h +++ b/cinelerra-5.1/cinelerra/mwindow.h @@ -516,7 +516,7 @@ public: void beep(double freq, double secs, double gain); int enable_proxy(); int disable_proxy(); - int to_proxy(Asset *asset, int new_scale); + int to_proxy(Asset *asset, int new_scale, int new_use_scaler); ProxyBeep *proxy_beep; void dump_plugins(FILE *fp=stdout); diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index 306975c2..78b35f42 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -1894,9 +1894,6 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui) } } - if( calling_window_gui != gui ) - gui->unlock_window(); - awindow->gui->async_update_assets(); cwindow->refresh_frame(CHANGE_ALL); @@ -2223,9 +2220,6 @@ void MWindow::undo_entry(BC_WindowBase *calling_window_gui) } } - if( calling_window_gui != gui ) - gui->unlock_window(); - awindow->gui->async_update_assets(); cwindow->refresh_frame(CHANGE_ALL); diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index 679a56e3..baea64a8 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -251,6 +251,7 @@ void MWindowGUI::get_scrollbars(int flush) void MWindowGUI::create_objects() { + lock_window("MWindowGUI::create_objects"); const int debug = 0; resource_thread = new ResourceThread(mwindow, this); @@ -373,6 +374,7 @@ void MWindowGUI::create_objects() pane[TOP_LEFT_PANE]->canvas->activate(); if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__); + unlock_window(); } void MWindowGUI::redraw_time_dependancies() @@ -666,9 +668,9 @@ void MWindowGUI::update_proxy_toggle() { if( mwindow->edl->session->proxy_scale == 1 && mwindow->edl->session->proxy_disabled_scale == 1 ) - proxy_toggle->hide_window(); + proxy_toggle->hide(); else - proxy_toggle->show_window(); + proxy_toggle->show(); } void MWindowGUI::update_plugintoggles() @@ -2388,15 +2390,36 @@ int FFMpegToggle::handle_event() ProxyToggle::ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y) - : BC_Toggle(x, y, mwindow->theme->proxy_toggle, + : BC_Toggle(x, y, ( !mwindow->edl->session->proxy_use_scaler ? + mwindow->theme->proxy_p_toggle : + mwindow->theme->proxy_s_toggle ), mwindow->edl->session->proxy_disabled_scale != 1) { this->mwindow = mwindow; this->mbuttons = mbuttons; + scaler_images = mwindow->edl->session->proxy_use_scaler; set_tooltip(mwindow->edl->session->proxy_disabled_scale==1 ? _("Disable proxy") : _("Enable proxy")); } +void ProxyToggle::show() +{ + int use_scaler = mwindow->edl->session->proxy_use_scaler; + if( scaler_images != use_scaler ) + set_images(!(scaler_images=use_scaler) ? + mwindow->theme->proxy_p_toggle : + mwindow->theme->proxy_s_toggle ); + draw_face(1, 0); + if( is_hidden() ) + show_window(); +} + +void ProxyToggle::hide() +{ + if( !is_hidden() ) + hide_window(); +} + ProxyToggle::~ProxyToggle() { } diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h index d4205162..00aeb606 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.h +++ b/cinelerra-5.1/cinelerra/mwindowgui.h @@ -85,9 +85,12 @@ public: ~ProxyToggle(); int handle_event(); int keypress_event(); + void show(); + void hide(); MWindow *mwindow; MButtons *mbuttons; + int scaler_images; }; diff --git a/cinelerra-5.1/cinelerra/newfolder.C b/cinelerra-5.1/cinelerra/newfolder.C index dafa8f61..26ab5a19 100644 --- a/cinelerra-5.1/cinelerra/newfolder.C +++ b/cinelerra-5.1/cinelerra/newfolder.C @@ -35,15 +35,7 @@ NewFolder::NewFolder(MWindow *mwindow, AWindowGUI *awindow, int x, int y) : BC_Window(_(PROGRAM_NAME ": New folder"), - x, - y, - 320, - 120, - 0, - 0, - 0, - 0, - 1) + x, y, 320, 120, 0, 0, 0, 0, 1) { this->mwindow = mwindow; this->awindow = awindow; @@ -56,6 +48,7 @@ NewFolder::~NewFolder() void NewFolder::create_objects() { + lock_window("NewFolder::create_objects"); int x = 10, y = 10; add_tool(new BC_Title(x, y, _("Enter the name of the folder:"))); y += 20; @@ -65,6 +58,7 @@ void NewFolder::create_objects() x = get_w() - 100; add_subwindow(new BC_CancelButton(x, y)); show_window(); + unlock_window(); } const char* NewFolder::get_text() diff --git a/cinelerra-5.1/cinelerra/pluginclient.C b/cinelerra-5.1/cinelerra/pluginclient.C index 417dd917..4cab34b5 100644 --- a/cinelerra-5.1/cinelerra/pluginclient.C +++ b/cinelerra-5.1/cinelerra/pluginclient.C @@ -141,11 +141,7 @@ PluginClientFrame::~PluginClientFrame() PluginClientWindow::PluginClientWindow(PluginClient *client, - int w, - int h, - int min_w, - int min_h, - int allow_resize) + int w, int h, int min_w, int min_h, int allow_resize) : BC_Window(client->gui_string, client->window_x /* - w / 2 */, client->window_y /* - h / 2 */, diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C index e4a2cce3..439a6efb 100644 --- a/cinelerra-5.1/cinelerra/plugindialog.C +++ b/cinelerra-5.1/cinelerra/plugindialog.C @@ -53,10 +53,7 @@ PluginDialogThread::~PluginDialogThread() } void PluginDialogThread::start_window(Track *track, - Plugin *plugin, - const char *title, - int is_mainmenu, - int data_type) + Plugin *plugin, const char *title, int is_mainmenu, int data_type) { if(!BC_DialogThread::is_running()) { diff --git a/cinelerra-5.1/cinelerra/probeprefs.C b/cinelerra-5.1/cinelerra/probeprefs.C index dcce262e..57472372 100644 --- a/cinelerra-5.1/cinelerra/probeprefs.C +++ b/cinelerra-5.1/cinelerra/probeprefs.C @@ -69,6 +69,7 @@ ProbeEditWindow::~ProbeEditWindow() void ProbeEditWindow::create_objects() { + lock_window("ProbeEditWindow::create_objects"); pb_enabled = new BC_Pixmap(this, BC_WindowBase::get_resources()->listbox_up, PIXMAP_ALPHA); @@ -95,6 +96,7 @@ void ProbeEditWindow::create_objects() list_update(); show_window(); + unlock_window(); } ProbeEditOK::ProbeEditOK(ProbeEditWindow *pb_window) diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C index 45feb595..420592ea 100644 --- a/cinelerra-5.1/cinelerra/proxy.C +++ b/cinelerra-5.1/cinelerra/proxy.C @@ -165,12 +165,14 @@ void ProxyDialog::handle_close_event(int result) eprintf("Specified format does not render video"); return; } - mwindow->edl->session->proxy_use_scaler = use_scaler; mwindow->edl->session->proxy_auto_scale = auto_scale; mwindow->edl->session->proxy_beep = beep; mwindow->edl->session->proxy_disabled_scale = 1; + mwindow->gui->lock_window("ProxyDialog::handle_close_event"); + mwindow->gui->update_proxy_toggle(); + mwindow->gui->unlock_window(); asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); - result = mwindow->to_proxy(asset, new_scale); + result = mwindow->to_proxy(asset, new_scale, use_scaler); if( result >= 0 && beep && new_scale != 1 ) { static struct { double freq, secs, gain; } tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } }; diff --git a/cinelerra-5.1/cinelerra/recconfirmdelete.C b/cinelerra-5.1/cinelerra/recconfirmdelete.C index f8328a6e..987b7717 100644 --- a/cinelerra-5.1/cinelerra/recconfirmdelete.C +++ b/cinelerra-5.1/cinelerra/recconfirmdelete.C @@ -44,6 +44,7 @@ RecConfirmDelete::~RecConfirmDelete() void RecConfirmDelete::create_objects(char *string) { + lock_window("RecConfirmDelete::create_objects"); char string2[256]; int x = 10, y = 10; sprintf(string2, _("Delete this file and %s?"), string); @@ -52,6 +53,7 @@ void RecConfirmDelete::create_objects(char *string) add_subwindow(new BC_OKButton(x, y)); x = get_w() - 100; add_subwindow(new BC_CancelButton(x, y)); + unlock_window(); } diff --git a/cinelerra-5.1/cinelerra/recordwindow.C b/cinelerra-5.1/cinelerra/recordwindow.C index 750462a6..87ad8cc6 100644 --- a/cinelerra-5.1/cinelerra/recordwindow.C +++ b/cinelerra-5.1/cinelerra/recordwindow.C @@ -28,16 +28,9 @@ #include "videodevice.inc" RecordWindow::RecordWindow(MWindow *mwindow, Record *record, int x, int y) - : BC_Window(_(PROGRAM_NAME ": Record"), - x, - y, - RECORD_WINDOW_WIDTH, - RECORD_WINDOW_HEIGHT, - (int)BC_INFINITY, - (int)BC_INFINITY, - 0, - 0, - 1) + : BC_Window(_(PROGRAM_NAME ": Record"), x, y, + RECORD_WINDOW_WIDTH, RECORD_WINDOW_HEIGHT, + (int)BC_INFINITY, (int)BC_INFINITY, 0, 0, 1) { this->mwindow = mwindow; this->record = record; @@ -49,32 +42,16 @@ RecordWindow::~RecordWindow() // delete loadmode; } - - void RecordWindow::create_objects() { -//printf("RecordWindow::create_objects 1\n"); + lock_window("RecordWindow::create_objects"); add_subwindow(new BC_Title(5, 5, _("Select a file to record to:"))); -//printf("RecordWindow::create_objects 1\n"); int x = 5, y = 25; - format_tools = new FormatTools(mwindow, - this, - record->default_asset); -//printf("RecordWindow::create_objects 1\n"); - format_tools->create_objects(x, - y, - 1, - 1, - 1, - 1, - 1, - 1, + format_tools = new FormatTools(mwindow, this, record->default_asset); + format_tools->create_objects(x, y, 1, 1, 1, 1, 1, 1, /* record->fixed_compression */ 0, - 1, - 0, - 0); -//printf("RecordWindow::create_objects 1\n"); + 1, 0, 0); // Not the same as creating a new file at each label. // Load mode is now located in the RecordGUI @@ -83,18 +60,12 @@ void RecordWindow::create_objects() // loadmode->create_objects(); add_subwindow(new BC_OKButton(this)); -//printf("RecordWindow::create_objects 1\n"); add_subwindow(new BC_CancelButton(this)); -//printf("RecordWindow::create_objects 1\n"); show_window(); + unlock_window(); } - - - - - RecordToTracks::RecordToTracks(Record *record, int default_) : BC_CheckBox(200, 270, default_) { this->record = record; } RecordToTracks::~RecordToTracks() diff --git a/cinelerra-5.1/cinelerra/reindex.C b/cinelerra-5.1/cinelerra/reindex.C index 5112b12b..27864c12 100644 --- a/cinelerra-5.1/cinelerra/reindex.C +++ b/cinelerra-5.1/cinelerra/reindex.C @@ -80,12 +80,14 @@ ReIndexWindow::~ReIndexWindow() ReIndexWindow::create_objects() { + lock_window("ReIndexWindow::create_objects"); BC_SubWindow *subwindow; add_subwindow(subwindow = new BC_SubWindow(0, 0, w, h, MEGREY)); subwindow->add_subwindow(new BC_Title(5, 5, _("Redraw all indexes for the current project?"))); subwindow->add_subwindow(ok = new ReIndexOkButton(this)); subwindow->add_subwindow(cancel = new ReIndexCancelButton(this)); + unlock_window(); } ReIndexOkButton::ReIndexOkButton(ReIndexWindow *window) diff --git a/cinelerra-5.1/cinelerra/resizetrackthread.C b/cinelerra-5.1/cinelerra/resizetrackthread.C index a9548455..e91d09b9 100644 --- a/cinelerra-5.1/cinelerra/resizetrackthread.C +++ b/cinelerra-5.1/cinelerra/resizetrackthread.C @@ -118,9 +118,8 @@ ResizeVTrackWindow::~ResizeVTrackWindow() void ResizeVTrackWindow::create_objects() { - int x = 10, y = 10; - lock_window("ResizeVTrackWindow::create_objects"); + int x = 10, y = 10; BC_Title *size_title = new BC_Title(x, y, _("Size:")); add_subwindow(size_title); int x1 = x + size_title->get_w(); diff --git a/cinelerra-5.1/cinelerra/scale.C b/cinelerra-5.1/cinelerra/scale.C index 33cc0561..b963bb93 100644 --- a/cinelerra-5.1/cinelerra/scale.C +++ b/cinelerra-5.1/cinelerra/scale.C @@ -203,6 +203,7 @@ ScaleWindow::~ScaleWindow() void ScaleWindow::create_objects() { + lock_window("ScaleWindow::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(x, y, _("New camera size:"))); add_subwindow(new BC_Title(x + 200, y, _("New projector size:"))); @@ -309,6 +310,7 @@ void ScaleWindow::create_objects() add_subwindow(new BC_OKButton(x, y)); x += 200; add_subwindow(new BC_CancelButton(x, y)); + unlock_window(); } ScaleSizeText::ScaleSizeText(int x, int y, ScaleThread *thread, int *output) diff --git a/cinelerra-5.1/cinelerra/setformat.C b/cinelerra-5.1/cinelerra/setformat.C index bf22103f..cf8f1a2e 100644 --- a/cinelerra-5.1/cinelerra/setformat.C +++ b/cinelerra-5.1/cinelerra/setformat.C @@ -295,15 +295,12 @@ SetFormatWindow::~SetFormatWindow() void SetFormatWindow::create_objects() { + lock_window("SetFormatWindow::create_objects"); int x = 10, y = mwindow->theme->setformat_y1; BC_TextBox *textbox; BC_Title *title; - - lock_window("SetFormatWindow::create_objects"); mwindow->theme->draw_setformat_bg(this); - - presets = new SetFormatPresets(mwindow, this, x, y); presets->create_objects(); x = presets->x; // y = presets->y; diff --git a/cinelerra-5.1/cinelerra/shbtnprefs.C b/cinelerra-5.1/cinelerra/shbtnprefs.C index cad3a6a2..b1de0be6 100644 --- a/cinelerra-5.1/cinelerra/shbtnprefs.C +++ b/cinelerra-5.1/cinelerra/shbtnprefs.C @@ -200,6 +200,7 @@ ShBtnErrWarn::~ShBtnErrWarn() void ShBtnTextWindow::create_objects() { + lock_window("ShBtnTextWindow::create_objects"); int x = 10, y = 10; int x1 = 160; BC_Title *title = new BC_Title(x, y, _("Label:")); @@ -217,6 +218,7 @@ void ShBtnTextWindow::create_objects() y = get_h() - ShBtnTextOK::calculate_h() - 10; add_subwindow(new ShBtnTextOK(this, x, y)); show_window(); + unlock_window(); } ShBtnTextOK::ShBtnTextOK(ShBtnTextWindow *st_window, int x, int y) @@ -267,6 +269,7 @@ int ShBtnTextDialog::start_edit(ShBtnPref *pref) void ShBtnEditWindow::create_objects() { + lock_window("ShBtnEditWindow::create_objects"); Preferences *preferences = shbtn_edit->pwindow->thread->preferences; for( int i=0; ishbtn_prefs.size(); ++i ) { shbtn_items.append(new ShBtnPrefItem(preferences->shbtn_prefs[i])); @@ -281,6 +284,7 @@ void ShBtnEditWindow::create_objects() add_subwindow(edit_button = new ShBtnEditButton(this, x, y)); add_subwindow(new BC_OKButton(this)); show_window(); + unlock_window(); } int ShBtnEditWindow::start_edit(ShBtnPref *pref) diff --git a/cinelerra-5.1/cinelerra/splashgui.C b/cinelerra-5.1/cinelerra/splashgui.C index 3d9c4515..e91d640d 100644 --- a/cinelerra-5.1/cinelerra/splashgui.C +++ b/cinelerra-5.1/cinelerra/splashgui.C @@ -30,19 +30,8 @@ SplashGUI::SplashGUI(VFrame *bg, int x, int y) - : BC_Window(_(PROGRAM_NAME ": Loading"), - x, - y, - bg->get_w(), - bg->get_h(), - -1, - -1, - 0, - 0, - 1, - -1, - "", - 0) + : BC_Window(_(PROGRAM_NAME ": Loading"), x, y, bg->get_w(), bg->get_h(), + -1, -1, 0, 0, 1, -1, "", 0) { this->bg = bg; } @@ -54,13 +43,21 @@ SplashGUI::~SplashGUI() void SplashGUI::create_objects() { + lock_window("SplashGUI::create_objects"); draw_vframe(bg, 0, 0); flash(); show_window(); - add_subwindow(operation = - new BC_Title(5, + operation = new BC_Title(5, get_h() - get_text_height(MEDIUMFONT) - 5, - _("Loading..."))); + _("Loading...")); + add_subwindow(operation); + unlock_window(); } +void SplashGUI::update_status(const char *text) +{ + lock_window("SplashGUI::update_status"); + operation->update(text); + unlock_window(); +} diff --git a/cinelerra-5.1/cinelerra/splashgui.h b/cinelerra-5.1/cinelerra/splashgui.h index afeebc60..5383b9f8 100644 --- a/cinelerra-5.1/cinelerra/splashgui.h +++ b/cinelerra-5.1/cinelerra/splashgui.h @@ -31,6 +31,7 @@ public: SplashGUI(VFrame *bg, int x, int y); ~SplashGUI(); void create_objects(); + void update_status(const char *text); BC_Title *operation; VFrame *bg; }; diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C index 5764aeae..1604d8db 100644 --- a/cinelerra-5.1/cinelerra/swindow.C +++ b/cinelerra-5.1/cinelerra/swindow.C @@ -139,6 +139,7 @@ int SWindowSaveFile::handle_event() void SWindowGUI::create_objects() { + lock_window("SWindowGUI::create_objects"); int x = 10, y = 10; BC_Title *title = new BC_Title(x, y, _("Path:")); add_subwindow(title); @@ -197,6 +198,7 @@ void SWindowGUI::create_objects() add_subwindow(ok); cancel = new SWindowCancel(this, cancel_x, cancel_y); add_subwindow(cancel); + unlock_window(); } void SWindowGUI::load() diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C index 7bbcceb6..65865a24 100644 --- a/cinelerra-5.1/cinelerra/theme.C +++ b/cinelerra-5.1/cinelerra/theme.C @@ -128,7 +128,8 @@ Theme::Theme() edithandleout_data = 0; extract_data = 0; ffmpeg_toggle = 0; - proxy_toggle = 0; + proxy_s_toggle = 0; + proxy_p_toggle = 0; infoasset_data = 0; in_point = 0; insert_data = 0; @@ -597,7 +598,7 @@ void Theme::get_mwindow_sizes(MWindowGUI *gui, int w, int h) { mbuttons_x = 0; mbuttons_y = gui->menu_h() + 1; - mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2); + mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2); mbuttons_h = get_image("mbutton_bg")->get_h(); mclock_x = window_border - 5; mclock_y = mbuttons_y - 1 + mbuttons_h; diff --git a/cinelerra-5.1/cinelerra/theme.h b/cinelerra-5.1/cinelerra/theme.h index 35dad586..47e54584 100644 --- a/cinelerra-5.1/cinelerra/theme.h +++ b/cinelerra-5.1/cinelerra/theme.h @@ -325,7 +325,8 @@ public: VFrame **edithandleout_data; VFrame **extract_data; VFrame **ffmpeg_toggle; - VFrame **proxy_toggle; + VFrame **proxy_p_toggle; + VFrame **proxy_s_toggle; VFrame **infoasset_data; VFrame **in_point; VFrame **insert_data; diff --git a/cinelerra-5.1/cinelerra/tipwindow.C b/cinelerra-5.1/cinelerra/tipwindow.C index 3474f494..5ad90927 100644 --- a/cinelerra-5.1/cinelerra/tipwindow.C +++ b/cinelerra-5.1/cinelerra/tipwindow.C @@ -125,6 +125,7 @@ TipWindowGUI::TipWindowGUI(MWindow *mwindow, TipWindow *thread, int x, int y) void TipWindowGUI::create_objects() { + lock_window("TipWindowGUI::create_objects"); int x = 10, y = 10; add_subwindow(tip_text = new BC_Title(x, y, thread->get_current_tip(0))); y = get_h() - 30; @@ -142,6 +143,7 @@ void TipWindowGUI::create_objects() show_window(); raise_window(); + unlock_window(); } int TipWindowGUI::keypress_event() diff --git a/cinelerra-5.1/cinelerra/videowindowgui.C b/cinelerra-5.1/cinelerra/videowindowgui.C index 0afff0bc..252e5710 100644 --- a/cinelerra-5.1/cinelerra/videowindowgui.C +++ b/cinelerra-5.1/cinelerra/videowindowgui.C @@ -33,15 +33,8 @@ VideoWindowGUI::VideoWindowGUI(VideoWindow *thread, int w, int h) : BC_Window(_(PROGRAM_NAME ": Video out"), - (int)BC_INFINITY, - (int)BC_INFINITY, - w, - h, - 10, - 10, - 1, - 1, - 1) + (int)BC_INFINITY, (int)BC_INFINITY, + w, h, 10, 10, 1, 1, 1) { this->thread = thread; } @@ -52,11 +45,12 @@ VideoWindowGUI::~VideoWindowGUI() void VideoWindowGUI::create_objects() { + lock_window("VideoWindowGUI::create_objects"); add_subwindow(canvas = new VideoWindowCanvas(this, get_w(), get_h())); update_title(); + unlock_window(); } - int VideoWindowGUI::keypress_event() { } diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index 87909d2a..e3f323c5 100644 --- a/cinelerra-5.1/cinelerra/vwindowgui.C +++ b/cinelerra-5.1/cinelerra/vwindowgui.C @@ -201,9 +201,9 @@ void VWindowGUI::update_sources(const char *title) void VWindowGUI::create_objects() { + lock_window("VWindowGUI::create_objects"); in_point = 0; out_point = 0; - lock_window("VWindowGUI::create_objects"); set_icon(mwindow->theme->get_image("vwindow_icon")); //printf("VWindowGUI::create_objects 1\n"); diff --git a/cinelerra-5.1/cinelerra/wwindow.C b/cinelerra-5.1/cinelerra/wwindow.C index b7ffb644..4f522f31 100644 --- a/cinelerra-5.1/cinelerra/wwindow.C +++ b/cinelerra-5.1/cinelerra/wwindow.C @@ -79,6 +79,7 @@ WWindowGUI::WWindowGUI(WWindow *thread, int x, int y) void WWindowGUI::create_objects() { + lock_window("WWindowGUI::create_objects"); int x = 10, y = 10; add_subwindow(new BC_TextBox(x, y, get_w()-50, 3, thread->warn_text)); y = get_h() - 30; @@ -87,6 +88,7 @@ void WWindowGUI::create_objects() x = get_w() - BC_CancelButton::calculate_w() - 10; add_subwindow(new BC_CancelButton(x, y)); show_window(); + unlock_window(); } WDisable::WDisable(WWindowGUI *gui, int x, int y) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 1157b0a3..f521b167 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -47,6 +47,7 @@ CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5]) CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox]) CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no]) CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto]) +CHECK_WITH([booby],[window lock trace booby trap],[BOOBY],[no]) CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes]) CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes]) CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes]) @@ -835,6 +836,7 @@ echo " using: with-ladspa-dir = $WANT_LADSPA_DIR" echo " using: with-opencv = $WANT_OPENCV" echo " using: with-git-ffmpeg = $WANT_GIT_FFMPEG" echo " using: with-noelision = $WANT_NOELISION" +echo " using: with-booby = $WANT_BOOBY" echo " using: with-libzmpeg = $WANT_LIBZMPEG" echo " using: with-commerical = $WANT_COMMERCIAL" echo "" @@ -864,6 +866,9 @@ if test "x$WANT_OPUS" = "xyes"; then CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus' fi fi +if test "x$WANT_BOOBY" != "xno"; then + CFG_CFLAGS+=" -DBOOBY" +fi # intel lock elision bugs if test "x$WANT_NOELISION" != "xno"; then diff --git a/cinelerra-5.1/guicast/bcfilebox.C b/cinelerra-5.1/guicast/bcfilebox.C index ea9c58f5..6e194eba 100644 --- a/cinelerra-5.1/guicast/bcfilebox.C +++ b/cinelerra-5.1/guicast/bcfilebox.C @@ -553,6 +553,7 @@ BC_FileBox::~BC_FileBox() void BC_FileBox::create_objects() { + lock_window("BC_FileBox::create_objects"); int x = 10, y = 10; BC_Resources *resources = BC_WindowBase::get_resources(); int directory_title_margin = MAX(20, @@ -662,6 +663,7 @@ void BC_FileBox::create_objects() refresh(); show_window(); + unlock_window(); } int BC_FileBox::get_listbox_w() diff --git a/cinelerra-5.1/guicast/bcnewfolder.C b/cinelerra-5.1/guicast/bcnewfolder.C index 850a020d..cc9d4b1b 100644 --- a/cinelerra-5.1/guicast/bcnewfolder.C +++ b/cinelerra-5.1/guicast/bcnewfolder.C @@ -56,6 +56,7 @@ BC_NewFolder::~BC_NewFolder() void BC_NewFolder::create_objects() { + lock_window("BC_NewFolder::create_objects"); int x = 10, y = 10; add_tool(new BC_Title(x, y, _("Enter the name of the folder:"))); y += 20; @@ -65,6 +66,7 @@ void BC_NewFolder::create_objects() x = get_w() - 100; add_subwindow(new BC_CancelButton(this)); show_window(); + unlock_window(); } const char* BC_NewFolder::get_text() diff --git a/cinelerra-5.1/guicast/bcprogressbox.C b/cinelerra-5.1/guicast/bcprogressbox.C index ac49c98a..fde95804 100644 --- a/cinelerra-5.1/guicast/bcprogressbox.C +++ b/cinelerra-5.1/guicast/bcprogressbox.C @@ -133,7 +133,7 @@ BC_ProgressWindow::~BC_ProgressWindow() int BC_ProgressWindow::create_objects(const char *text, int64_t length) { int x = 10, y = 10; - + lock_window("BC_ProgressWindow::create_objects"); // Recalculate width based on text if(text) { @@ -151,7 +151,7 @@ int BC_ProgressWindow::create_objects(const char *text, int64_t length) add_tool(bar = new BC_ProgressBar(x, y, get_w() - 20, length)); add_tool(new BC_CancelButton(this)); show_window(1); - + unlock_window(); return 0; } diff --git a/cinelerra-5.1/guicast/bctrace.C b/cinelerra-5.1/guicast/bctrace.C index 027379bc..930eabfc 100644 --- a/cinelerra-5.1/guicast/bctrace.C +++ b/cinelerra-5.1/guicast/bctrace.C @@ -5,6 +5,21 @@ #include "bctrace.h" +#ifdef BOOBY +#include +#define BT_BUF_SIZE 100 +// booby trap (backtrace) +void booby() { + printf("BOOBY!\n"); + void *buffer[BT_BUF_SIZE]; + int nptrs = backtrace(buffer, BT_BUF_SIZE); + char **trace = backtrace_symbols(buffer, nptrs); + if( !trace ) return; + for( int i=0; i +#ifdef BOOBY +#define BT if( top_level->display_lock_owner != pthread_self() ) booby(); +void booby(); +#else +#define BT +#endif class BC_Trace { diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C index 24dc5872..db085e86 100644 --- a/cinelerra-5.1/guicast/bcwindowbase.C +++ b/cinelerra-5.1/guicast/bcwindowbase.C @@ -390,12 +390,8 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title #endif id = get_resources()->get_id(); - int need_lock = 0; if(parent_window) top_level = parent_window->top_level; - if( top_level ) { // need this to avoid deadlock with Xlib's locks - need_lock = 1; - lock_window("BC_WindowBase::create_window"); - } + if( top_level ) lock_window("BC_WindowBase::create_window"); get_resources()->create_window_lock->lock("BC_WindowBase::create_window"); #ifdef HAVE_LIBXXF86VM @@ -445,6 +441,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title if( shm_completion_event < 0 ) shm_completion_event = ShmCompletion + XShmGetEventBase(display); #endif + lock_window("BC_WindowBase::create_window 1"); screen = DefaultScreen(display); rootwin = RootWindow(display, screen); @@ -638,7 +635,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title if(!hidden) show_window(); } get_resources()->create_window_lock->unlock(); - if(need_lock) unlock_window(); + unlock_window(); return 0; } diff --git a/cinelerra-5.1/guicast/bcwindowdraw.C b/cinelerra-5.1/guicast/bcwindowdraw.C index 5f0bb48c..c81c3696 100644 --- a/cinelerra-5.1/guicast/bcwindowdraw.C +++ b/cinelerra-5.1/guicast/bcwindowdraw.C @@ -29,6 +29,7 @@ #include "bcwindowbase.h" #include "clip.h" #include "bccolors.h" +#include "bctrace.h" #include "cursors.h" #include "fonts.h" #include "vframe.h" @@ -38,7 +39,7 @@ #include "workarounds.h" void BC_WindowBase::copy_area(int x1, int y1, int x2, int y2, int w, int h, BC_Pixmap *pixmap) -{ +{ BT XCopyArea(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, @@ -47,7 +48,7 @@ void BC_WindowBase::copy_area(int x1, int y1, int x2, int y2, int w, int h, BC_P void BC_WindowBase::draw_box(int x, int y, int w, int h, BC_Pixmap *pixmap) -{ +{ BT //if(x == 0) printf("BC_WindowBase::draw_box %d %d %d %d\n", x, y, w, h); XFillRectangle(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, @@ -56,7 +57,7 @@ void BC_WindowBase::draw_box(int x, int y, int w, int h, BC_Pixmap *pixmap) void BC_WindowBase::draw_circle(int x, int y, int w, int h, BC_Pixmap *pixmap) -{ +{ BT XDrawArc(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64); @@ -64,7 +65,7 @@ void BC_WindowBase::draw_circle(int x, int y, int w, int h, BC_Pixmap *pixmap) void BC_WindowBase::draw_arc(int x, int y, int w, int h, int start_angle, int angle_length, BC_Pixmap *pixmap) -{ +{ BT XDrawArc(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, top_level->gc, x, y, (w - 1), (h - 2), start_angle * 64, @@ -72,14 +73,14 @@ void BC_WindowBase::draw_arc(int x, int y, int w, int h, } void BC_WindowBase::draw_disc(int x, int y, int w, int h, BC_Pixmap *pixmap) -{ +{ BT XFillArc(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64); } void BC_WindowBase::clear_box(int x, int y, int w, int h, BC_Pixmap *pixmap) -{ +{ BT set_color(bg_color); Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap; XFillRectangle(top_level->display, xpixmap, top_level->gc, x, y, w, h); @@ -94,6 +95,7 @@ void BC_WindowBase::draw_text_line(int x, int y, const char *text, int len, return; } #endif + BT Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap; if( get_resources()->use_fontset ) { XFontSet fontset = top_level->get_curr_fontset(); @@ -147,7 +149,7 @@ void BC_WindowBase::draw_text(int x, int y, const char *text, int length, draw_xft_text(x, y, text, length, pixmap); return; } - + BT for(int i = 0, j = 0; i <= length; i++) { if(text[i] == '\n' || text[i] == 0) { if(get_resources()->use_fontset && top_level->get_curr_fontset()) { @@ -184,7 +186,7 @@ void BC_WindowBase::draw_utf8_text(int x, int y, 1); return; } - + BT for(int i = 0, j = 0; i <= length; i++) { if(text[i] == '\n' || text[i] == 0) @@ -250,7 +252,7 @@ void BC_WindowBase::draw_xft_text(int x, int y, void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font, int x, int y, const FcChar32 *fc, int len, BC_Pixmap *pixmap) -{ +{ BT Pixmap draw_pixmap = 0; XftDraw *xft_draw = (XftDraw *) (pixmap ? pixmap->opaque_xft_draw : this->pixmap->opaque_xft_draw); @@ -295,6 +297,7 @@ int BC_WindowBase::draw_single_text(int draw, int font, if( !length ) return 0; if( !get_resources()->use_xft ) { + BT if( !get_font_struct(font) ) return 0; XChar2b xtext[length], *xp = xtext; for( int i=0; i *x, ArrayList *y, BC_Pixmap *pixmap) -{ +{ BT int npoints = MIN(x->total, y->total); XPoint *points = new XPoint[npoints]; @@ -477,7 +480,7 @@ void BC_WindowBase::draw_polygon(ArrayList *x, ArrayList *y, BC_Pixmap } void BC_WindowBase::fill_polygon(ArrayList *x, ArrayList *y, BC_Pixmap *pixmap) -{ +{ BT int npoints = MIN(x->total, y->total); XPoint *points = new XPoint[npoints]; @@ -500,7 +503,7 @@ void BC_WindowBase::fill_polygon(ArrayList *x, ArrayList *y, BC_Pixmap void BC_WindowBase::draw_rectangle(int x, int y, int w, int h) -{ +{ BT XDrawRectangle(top_level->display, pixmap->opaque_pixmap, top_level->gc, @@ -668,7 +671,7 @@ void BC_WindowBase::draw_border(char *text, int x, int y, int w, int h) } void BC_WindowBase::draw_triangle_down_flat(int x, int y, int w, int h) -{ +{ BT int x1, y1, x2, y2, x3; XPoint point[3]; @@ -689,7 +692,7 @@ void BC_WindowBase::draw_triangle_down_flat(int x, int y, int w, int h) void BC_WindowBase::draw_triangle_up(int x, int y, int w, int h, int light1, int light2, int middle, int shadow1, int shadow2) -{ +{ BT int x1, y1, x2, y2, x3; XPoint point[3]; @@ -762,7 +765,7 @@ void BC_WindowBase::draw_triangle_down(int x, int y, int w, int h, void BC_WindowBase::draw_triangle_left(int x, int y, int w, int h, int light1, int light2, int middle, int shadow1, int shadow2) -{ +{ BT int x1, y1, x2, y2, y3; XPoint point[3]; @@ -799,7 +802,7 @@ void BC_WindowBase::draw_triangle_left(int x, int y, int w, int h, void BC_WindowBase::draw_triangle_right(int x, int y, int w, int h, int light1, int light2, int middle, int shadow1, int shadow2) -{ +{ BT int x1, y1, x2, y2, y3; XPoint point[3]; @@ -847,7 +850,7 @@ void BC_WindowBase::draw_check(int x, int y) } void BC_WindowBase::draw_tiles(BC_Pixmap *tile, int origin_x, int origin_y, int x, int y, int w, int h) -{ +{ BT if(!tile) { set_color(bg_color); @@ -865,7 +868,7 @@ void BC_WindowBase::draw_tiles(BC_Pixmap *tile, int origin_x, int origin_y, int } void BC_WindowBase::draw_top_tiles(BC_WindowBase *parent_window, int x, int y, int w, int h) -{ +{ BT Window tempwin; int origin_x, origin_y; XTranslateCoordinates(top_level->display, @@ -892,7 +895,7 @@ void BC_WindowBase::draw_top_background(BC_WindowBase *parent_window, int w, int h, BC_Pixmap *pixmap) -{ +{ BT Window tempwin; int top_x, top_y; XLockDisplay(top_level->display); @@ -943,8 +946,7 @@ void BC_WindowBase::draw_bitmap(BC_Bitmap *bitmap, int src_w, int src_h, BC_Pixmap *pixmap) -{ - +{ BT // Hide cursor if video enabled update_video_cursor(); @@ -1002,7 +1004,7 @@ void BC_WindowBase::draw_bitmap(BC_Bitmap *bitmap, void BC_WindowBase::draw_pixel(int x, int y, BC_Pixmap *pixmap) -{ +{ BT XDrawPoint(top_level->display, pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap, top_level->gc, @@ -1019,7 +1021,7 @@ void BC_WindowBase::draw_pixmap(BC_Pixmap *pixmap, int src_x, int src_y, BC_Pixmap *dst) -{ +{ BT pixmap->write_drawable(dst ? dst->opaque_pixmap : this->pixmap->opaque_pixmap, dest_x, dest_y, @@ -1102,7 +1104,7 @@ void BC_WindowBase::draw_tooltip(const char *text) } void BC_WindowBase::slide_left(int distance) -{ +{ BT if(distance < w) { XCopyArea(top_level->display, @@ -1119,7 +1121,7 @@ void BC_WindowBase::slide_left(int distance) } void BC_WindowBase::slide_right(int distance) -{ +{ BT if(distance < w) { XCopyArea(top_level->display, @@ -1136,7 +1138,7 @@ void BC_WindowBase::slide_right(int distance) } void BC_WindowBase::slide_up(int distance) -{ +{ BT if(distance < h) { XCopyArea(top_level->display, @@ -1161,7 +1163,7 @@ void BC_WindowBase::slide_up(int distance) } void BC_WindowBase::slide_down(int distance) -{ +{ BT if(distance < h) { XCopyArea(top_level->display, diff --git a/cinelerra-5.1/guicast/errorbox.C b/cinelerra-5.1/guicast/errorbox.C index ed374926..91504d23 100644 --- a/cinelerra-5.1/guicast/errorbox.C +++ b/cinelerra-5.1/guicast/errorbox.C @@ -30,8 +30,9 @@ ErrorBox::~ErrorBox() { } -int ErrorBox::create_objects(const char *text) +void ErrorBox::create_objects(const char *text) { + lock_window("ErrorBox::create_objects"); int x = 10, y = 10; add_subwindow(new BC_Title(get_w() / 2, @@ -44,5 +45,5 @@ int ErrorBox::create_objects(const char *text) y = get_h() - 50; add_tool(new BC_OKButton(x, y)); show_window(1); - return 0; + unlock_window(); } diff --git a/cinelerra-5.1/guicast/errorbox.h b/cinelerra-5.1/guicast/errorbox.h index 578a3db1..96efa72e 100644 --- a/cinelerra-5.1/guicast/errorbox.h +++ b/cinelerra-5.1/guicast/errorbox.h @@ -34,7 +34,7 @@ public: int h = 120); virtual ~ErrorBox(); - int create_objects(const char *text); + void create_objects(const char *text); }; #endif diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C b/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C index 32ac6781..10692ce4 100644 --- a/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C +++ b/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C @@ -2478,6 +2478,7 @@ int BluebananaWindow::repeat_event(int64_t d){ if(config_consume!=config_produce) flush_config_change(); } + if(!plugin->server->plugin) return 0; if(!plugin->server->plugin->on) return 0; if(d==207){ diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index c6bbc6e6..90dfa4ee 100644 --- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C +++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C @@ -622,12 +622,19 @@ void BlondTheme::initialize() "ff_down.png", "ff_checkedhi.png"); - proxy_toggle = new_image_set(5, - "proxy_up.png", - "proxy_hi.png", - "proxy_chkd.png", - "proxy_down.png", - "proxy_chkdhi.png"); + proxy_p_toggle = new_image_set(5, + "proxy_p_up.png", + "proxy_p_hi.png", + "proxy_p_chkd.png", + "proxy_p_down.png", + "proxy_p_chkdhi.png"); + + proxy_s_toggle = new_image_set(5, + "proxy_s_up.png", + "proxy_s_hi.png", + "proxy_s_chkd.png", + "proxy_s_down.png", + "proxy_s_chkdhi.png"); shbtn_data = new_image_set(3, "shbtn_up.png", diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png deleted file mode 100644 index 98430bc1916cadbd3ed98ccf934825a61c23b576..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 794 zcmV+#1LgdQP)WFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBmainmenu->get_h(); - mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2); + mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2); mbuttons_h = get_image("mbutton_bg")->get_h(); mclock_x = 10; mclock_y = mbuttons_y + mbuttons_h + CWINDOW_METER_MARGIN; diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png deleted file mode 100644 index 98430bc1916cadbd3ed98ccf934825a61c23b576..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 794 zcmV+#1LgdQP)WFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBmainmenu->get_h(); - mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2); + mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2); mbuttons_h = get_image("mbutton_left")->get_h(); mclock_x = 20; //x position of digits in clock window mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN; diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png deleted file mode 100644 index 98430bc1916cadbd3ed98ccf934825a61c23b576..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 794 zcmV+#1LgdQP)WFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzBWFU8GbZ8()Nlj2>E@cM*00MqVL_t(Y$L*F&NK{c6 z$G`8~JGZ%mE~dp831Q?wk{IT_vka<5W$k+4x=n2gS|pTB(G&#+QHa#8wcs{;KoQYy zW-=s+t*oPP^%6jIJ3BM8s#y#C+s{LgnDL{%2wZ#xLs0BlIv)={mF zpnqIe0e%Z0rQM~Jb)!&7)K)8AC?sl?vad;LB`X4$n@iL)(-~$y5shM4O6zbHNqQg} zRd1N-Br}~Z7F#!z4PY2DPDHarM9j2a2<}tLy63vBn@R?8)QTLZZJlXyiinOdvla-yCBg${J|5J2iD(xyZCl1(daF{D1W;sV zjhT*`CXGsICG+`~NJRh(3)c2n%oq`ZE;3V1u?j++_wkO1qk+Ajl|qLQnLXj~;8-b3!{O|>5b1U))gb_% z0*}`EzBgVrfN5qw0(2Qb&&-T!(zHxprP;0P+5YKi(FD+SfUbnY&p)i_GrIaC`fmWf Y0W;1lZcDcIDF6Tf07*qoM6N<$f-Xi>#Q*>R diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png deleted file mode 100644 index cecf4168a472a32ca262e30e6718f733b5b21257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)WFU8GbZ8()Nlj2>E@cM*00MVOL_t(Y$L&_lOH@%5 z|DAX5yylIxcnK8=LB&846!ZtQs6{00k|4-U(3j2=3=%5MG%B!-_(o|Fw2LISNd|oo zty^VZqeccbfjU}^^BnKJr-d^heT;9$q86Ur{W|COJLhnImr$W4l&ZIcxC;Pm%n@IR zJC*pc@Q-a3fc)Kor}YIQTF;qGn_pf1wG!vv)YMwIZYP*Cz7Ur~XTY1At0AKEAZjMp zeVx$yaM{6?It15!MMNziI@grTZ4M29Y&*`t?BaqpS(Y{68FRle2(~R3_;e6#X*Onv zgcu~E8UP?*)`~>pp#k(t`9x1n#+kX3nX`*HXuq`W7oOJbUMgk(#5k3*J*_WD+a3YY z0RUj;ESS5#O;5*tDIfll>~f4wWV0LBI8GM<$3P?sj^6-yKtx_)-ABMa5N*fehGyUv z2f@W;EcU6Ce+paE=6rq!OW93Cb*1hx^AIW3+H2b*Vf<3L&DE&XUSV0+iD>r^fuCz* z&h|_B=&#NJ3*bu5R-6HEe!dowNH-B3MClsb(@M4W+4jpn0-!OQ-5?z25&_4HO$g?< z3=EfQLI5{aF4xgtRrR@|5;UaKv4qxb(s4$K=oE+qm;+->$CrtToovk0C9I$E*w`*( zOgl5@KqNqPQaaA4r*(TnIvp!31Kz^I9td%}I7kXChjl*R)E|wGm6BsG2)2@KCyTS7 z@c5%K=4evN$Dy={XE)7O>#5j&?agGu_5EPbGmY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMKE>*?Yc;&J@#HD7I)L=pB6@j|VU)!d5QHS9;j4Ib{6 zICLmzqLN+Xrq4q1N!KE{vJ=nbEW2Uz>ZRG@o#kmkvx1kuE1q9{?&tjN_0!)>Iv##u z>l(jZe>Rpd{9#Lw{e8mpp?$k;&Jt6Zqv;YG#Mh)q97?rm|7~>aa!3MO{=-U^^c@FF zm>;MY_I{qw@gQ3*SM=A$)}Sews#7*EcVn$`x_#>6Z=r357tYM#dB}40#7A4cMV}Sl zEh-jWE|K^2z`4g-TtWWp4{gt#tSXYtqSv;2+vfw}$96AE6%*&(@<6C~Esssd;v)if zCI&6X51MWMvaq55h*aL9?dPP#gtC7KUfZUh`=PbtXq}0t%hwqNS^|MNznhMlFdP#K z*)yxL>vN!xsLvIyE3xbcgv*@yxhu|JI8=NmiG6)V&eyP#e;xnW8}gR~*B^TMmb)Dk N!k(^vF6*2UngF=_zx@CJ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png deleted file mode 100644 index 8c00e10b63d133d1696ecb537d7bab08e69d436f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)WFU8GbZ8()Nlj2>E@cM*00NRpL_t(Y$L&^2NR&|& z{?5JQ=r~4AiA6$WA!LbR^H>JePNGc`v~Uyjnq~weg;KM$jFdq9M`;n&GD+HH*`h_X zYG$fU56z|*ltndan&bHY_q3RiL~{CPENbD|UGBNx_npVR=MpkBpYE&_Qd|cBR%)*% z!`Cvw5%|ZpD8Mq`hTm}46LA4YMT55D!M9An{a-vw;Na6>j%qU0Vmbr<@18;;oB&ZZ zIrzEHaP3K(TzBqux4G71NOqQ=PEr6^>F$1HC1y&0|J$~i7?TwYM{~ht+n5(E- zx%)_pULqLvf%?ITDw9zi}?X>`o5y1`sV2&}P6_JtiT(or8>}!a~=nbrM z)PlI4h-?XWOb~Ek{Oefz<@|y1v;@r9feGiTY#TKbun$Bs2|NJs9U}54*Ifkc0AWK? zsKLM$ju|HdxsN`i!Y8vet&Y1kv4z@*P?5@y8GWR4U8gnl#0)N_+gx7Vyqi@EjR=IDNhNqR2vcPMCuycG<2%#vId|25dq!__eyEwQv~dv zX+kg$GSHu@2?4sKPok;Y9{iY5395$6a(#xo!D7P@5gh`N1anL&ZW??0xr`Ox`x&*m z&o85!l|mykPl8B-aL{7Ikl%1MRt=ZsrX|2X?b^Dmz&a=dT0qE41jYS&+$asmQ1jKb zuczjo(Ta!S0U11lIG2KPE1BOs64dM{$bR9|J=;vr0@C>vq;Mpn!+S6v)nus0Oii_% za0EbwPj^<5ppL|A$jfzoI$}Blowo2hX0$T178_9|ohHd=Tfh?TMO2i4(V-aUF6KOb slh!oUWbo`lM{RP7)+~NV{%Zk005qBi^N*#tZvX%Q07*qoM6N<$g285I8~^|S diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png new file mode 100644 index 0000000000000000000000000000000000000000..7b87034dcd826b04b2e13e27c4389999fd1c3667 GIT binary patch literal 680 zcmV;Z0$2TsP)BCsWkE9A}_2-k%2eSbrw-pR#X>Vi3y8{63W0xiZ1$K z)J-2kL>SDVE-VC#jGzl!Nc2etZHi7KW^U?q+j+YR22Gq}#|O^M`NKKS`@X;5D=a|s zq-&+UzzC%rDwIM+fFOuZW=-#Pr>_mTsY54AKqC_b5s`cmStr85x`)3X2dj;$mdToz zOZ`-40!bK?adxzg&~>lUnX@9N_xMD$GwT9Msd0}C$iHXIJD?La%MuB8Hk=5Iey%Sd zP?rZHReGVry%YgkCad-~VuEjY9`bEqTo`ga1L^@pWIu3uS&qO49tD>|W%lz)uQx19 z2I8;>DE$haL{$Ho6j1xoV2#64fnhK-xMsr1^$^1_%abY^d$8uijHLo4a2ohxgXgp( zx=lNqH2!F52xp;G;MCj0MY~$=mv7fKtrcNgQf0ccE+8VS-D-;h_;lz8e@g5;y;|0< z|5sOrrbA(mWjj#$CQQ|fDK36@rMN42AD>tII*YzVtPwC3d))zgI@U5*U;{-&K@jjM z)9jufoWTOL#e&z^?5E$oYC0DJ%Pz3>)&%+EF?!Dx&tMS?hVaO- zK=G!&Fput35O?UxDuD%eptfh~%9zW+;DJJ{B&EP8{XE)7O>#5xcNBx0c(di3@;2JeeU8CC>S|xv6<2KrREro^_jM z0;wmSE{-7{$KPJD_hNPwVSk{X%@W9cx}l?jHD58TX}V!(-eQh>imkm1!pvqJGwN#9 zIHI~PKUaj!aM7llx!>5C5C3^sd-P1Qn_Q%}=6-2M7XO331rZy}Qyi!Mqmr(l&3a(U+b3_n=$CHN+F-eT z{%5}K{XE)7O>#5xcNBkICmfRxCgvp3IPl66gHf+|;}hAeVt*&$>-B z85kISJY5_^JdP))9AGrEuMtRi`nHhuw3+>O( zHJ*R&VB!3b!9%UboFyt I=akR{0BerU=>Px# literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..8e098800bd2d0e269a24c909b5f48950f119c62c GIT binary patch literal 471 zcmV;|0Vw{7P)zfdLXotcz|AMwlp$ zGC6g{kKtE-=C zAKqWYA37`)ve{1OtyfHd2>6m*k~NVhkM;Ux1?V8A*bhKYNw=S2xVGWCFL3}Y3`*oe z+P1F`a=FQY0|@Zejp6S*H^vUaupns#z)hr_v)N2$d*~H71;TQ(`C4i;t{#k8gme}O z7ZYtk1(2k@ZWW}t#AhHNpChx7KFa4O5(TiNnaDPLl|Ao0$rjKecf0=NeVqJMKc+>% zT6LUh3z(O*LvksyG1Y+s5Xc`pj(V>@qsQo}-EQxX{XE)7O>#5xcNBpUJ_lh&G@QPi9C&iF1B#Zfaf$kjucZXWgcm z3=E8ho-U3d9>?EavG+dgAaVTT`=b)xvQmK=r5AkXh{%Y^6Ay z=tiXY!KM|_uA7&Zdb9;(sZ`Esk=8L$Rr9VZ@P4=R&hs7iU7Q~|-m>*RSa0X(;;8a~ zxnFbT?=yFEXO}r0TM@}19KaucL|r#4POQPvFL1?P)-~_64ujxm-+GH%E2E4|YSO&y`Ei?i%+qIHIcm!HV$HRU+jx771KMxR-FZ%S zLBLsoiJI%O>m3RLPdTf2=&RY?N>bJ0P?)Gt>!>F@>9Kj$Z{Mu7a=wp*6w-h2GeHZ7&;T629q zUCwhj=ef`Soc~{#1DZ3dYQ%K50JT6RP%JR4&=1ll=p{!vvp0BQ!$V2?rUAQ{BMN3C zxA#{S`h!IWM069#bUGjq0G5N)E;&2gWc!5UO^YhndwZ_^F>(=&@tT6dU{QyNYofQDF}*S1wfgQBYT8+9TRgY%&EJmt zlJ=d>Ev3JwFm*lxBp0#MiF6{Y8vntzHX|0DDQ^%;ilN7b*F12Jc_OC+3M;eUBYc=E zuNXc8I{r)ZS%*+i9|)-0Mq+Serkqh&0W_qhh;`F}KgN`ZNo8P74)v`HEq?ghbpZk= zCbRT#vmI%Adngi|2wAWeDDQ?=@<2`jR!Uk__12gP5;P3jjY9gOPUOnF$?7BNV)IaZ zU7-ETc#Y;GKxQMG?uRQq3*-pG^Hbw%KK_fx&yH}g;|WlbihgTl`1EUU{JN_GCJ?p4 zbr`$>@^ZwYtK_x& z?@u%bX!CaUSSfiG<=*(fmieBMNZwm89re%%$aipPI@j)xB|tA{kHOFiSDxbu3`42F zCpNsk9-NskE(u6>AW6CEfFD|blO8xd^FD*bQ*3p z9Q(XtZM3oM(e$AG&%i*+Dy#H9A`6UaF^tW?#>sW$e4Dqc$BiQhiRzPe`x5;8!D7z6 zv*;&5@hvn6h5Wf5kbBs=!;z01C8&z=6s1a;+ z1#EJ7SUlx|vx$!N=^9(R;lPKk11&D?hJd@d8rVp=Im}f2g$7f>YQDvSG<+EsP{>}l5nP9o>Eb3 xjWb_vM>LD$IMP`aY~mA^gD1;8ouk#SfIr49Ci1TwB%lBQ002ovPDHLkV1fuO>c{{9 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png new file mode 100644 index 0000000000000000000000000000000000000000..919ec080b6568ec439f5912306f3a97055e56a5d GIT binary patch literal 740 zcmVd01RnV zSad^gZEa<4bN~PV006wMvY7w?0$E8!K~zY`#gAkk=(*me_l-y08& zX^U=2%_h$2u`~Pj_r95VvxF9G!nTJ<%8LL-0K@@=3HZT43BXqZ3YvKqwmq8(1U_IF zMmssLluCO-k;nrgI@jukcBRrc-P>DkHQwjuxSGxS0+GlI5RIaP<_cgYlh?L=ocX2F zdRp7|oNsygi|XkyWH=nvQtlH%90AdB0HYSbo}^$>>(?MU3ILiplMy1_2?d0kgMq`% z_3G;FPNhKXAWfhly%NRZYS#f6__RSn67l${|DnLM%_uQ5q15=zYBl0DfNK%nSX+zA zU~ry@_HQ->G?YVN~YUz(C~ zregqq0M+XWVHl4=lxiqZtmkqAt=5HT7a(Jri;iWT2J`wx*HSbvI5^yP8}7#LheAaF zZ<}cl;y_mc8W&gJmV&gp3XoRnG7%-350qMHdmK+{{hom(FwYTlR%`v49OqlTT>ieY zvf@PJ@xA2tCrOC&0M2eXeJ*2~i){k{h!N2t5S;-4AthiK2n2(O#bR!k(mIs7?#V3J zeG%}2Qfh3!&~S`RD&K6Mg|6 WHsN0dALe@i0000WkyB7~0#AEU5ML|zqi`r}?QPA3hh!(UOOtTB@$@h6A4fM8wHt#?I{qz@tBljLyWde|=@ePxl+3Wgl2u^T!7VwJ0Kon<~Kq zZ$OKx8dz(dm&>-~dBv#j008UjUM7{2`y!ldnJLOL=z}oimg@!!eFfN56nWFea0%qB z2#5X+qLHfJaGc`pz61R2%EYlmLUYF80jGgUk*$5K<%;7JX4olhY~-`ndWEf~<$Vc) zd}7-iXq~XU7hzB1%5*ZB44(B`h8=5YsIUb3s;O*`_M;DUo6loSl~LbOfH?N9ijdv< zX1?d=*joQBu%ODEDuK1~Ig0pRtHnR6)q0f4xCc@xlQYI#1kN}8{Y%#^zUw&&t@Udn zjCA9KD!<}b&m@yUVaIbomH9Ykx|_q>UO~N1)^+iX!3WI)M}Yl}AqmhGkdHvgTKlk6 e;_?5y3BLiJr{^P6=<$dE0000h9uVVi+`5i<65cI=PZ4ffok9Y0B}DR8?Y_w5rES>WXdJ^M2p;-EEd-S1!!na zsWAXk1kQm>_%v;mA~WN~;_biz{_ur({FrH3gVcH$6Jtx zWsy0O!}Uy*%7sFIt9@bY6(Hj{tDfgw5TH{3qIg)TbP)SM>ku0oC5pUn>dd1Z1*mV` zk*4TpM*(t5T>+44#5G`L&vrbQOnwBg29X7A7>f{b2z=Yt`nwZ}RF7Yf20k|22;g|)&VSQt)EsL=lTD5!Y_vR(bmE+Eam_J002ovPDHLk FV1k65Iz#{f literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png new file mode 100644 index 0000000000000000000000000000000000000000..cac1aa3a509d8d22c1ee74a41a97f7be29433955 GIT binary patch literal 649 zcmV;40(Sk0P)|X2KWusfM38i$a)8FeSxVGLqHv8EK)n2BK}07 zZVl>ihn=}a&bWi#j|LfR?C1jVm!MV|BLWFrBzxZZsL{zdm`z_M$~Ja1RMD!^Ou3k5Upc)iBe&r&nCDbQ;Jwf7VyFZTG1u1+ z*$9C;i&n2!oR3$h`I-NXFs(yNzo8`C(w6zQbJL{?$l25$Pq>Rpn_ zPb0UXi*Z5C4wnmQY4r63vCYu`fFMPKUK=L(u_frTpNTQKELh75mK2-^5WFU8GbZ8()Nlj2>E@cM*00FT{L_t(Y$L&_pO58vc zokTVTt9`Xq+ET@b>OTne7b>>@(%q%~ffhxuv|mu@n^pP~`>c|eeNYI?Wm-dDx()jh{U0wWUu@PU-AIF4tl zg2!<@OUh>ejZzDfBv~M#oueah3ShIW2u0*AiIWT?Nz?Sj*cAwZU|A`3rj$~i=gs@R z_k+Z5W6aV`$s1!{kvN!|@_%}sw~!5=)oQinQdQ`5I*&>DNaAAnrzBDUjW7&@Vg$%FrQ4~!BsFOG^v|+Q|Za*5)hV?=lo&#t^Q8ZnOd@vZS4P7h;cEyNBIiWFT zk;Fk^?Wu^o89RYAO`jL6_+14n-pE;TYK(bVstVa*wB76Vo>aY%WQWlg0L@AG!NZN{ b|485uaJh>^#RDoR00000NkvXXu0mjfgP8a6 diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png deleted file mode 100644 index 5022c2574aa6a20ec157bfc8896536c8af2e4746..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)WFU8GbZ8()Nlj2>E@cM*00DhTL_t(Y$L-eNN)=HQ z2JoLsC(!IxOEN0DDBmH-S4gsV$s_dwMiLbD1VMMD^b%fYc+-V~L<*wkPsf=xT{s7( zp+j>fEeIFP#hyL;Ti;&$Ti2haDItP8%!WU!Lb z9BN^knV^-C1v@DZhZSMMgJ3(yXm^;cT!99+aR4J+9p!ECvCFOBk?(RNSRdov2s8QX zg9|5^)#ED@!IR*qztfYV9!>to4%&dV;kcb7$5z3G>0mFA{Gg%>NA^$ZF30S$yYC@V>$keCToa z)DpLt3SO2(__=}zU$vO3op_h=l%?RX)P~DnxHzB