p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / plugins / theme_blond_cv / blondcvtheme.C

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 0ee14d330ca7716e533a18cb9aa12a16cac58d31..fc9c629fcfbffd1d08b24075089de2f4fde89929 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -642,12 +642,19 @@ void BlondCVTheme::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",
@@ -911,7 +918,7 @@ void BlondCVTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->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;