x265 patch for threadpool shutdown fix submited as:

[goodguy/history.git] / cinelerra-5.0 / plugins / suv / suv.C

diff --git a/cinelerra-5.0/plugins/suv/suv.C b/cinelerra-5.0/plugins/suv/suv.C
index 7e2bdeac3da13037a014e29bc33815b1b00cc8b3..586c4dcd5c42c464ce98ec7923679e9780443285 100644 (file)
--- a/cinelerra-5.0/plugins/suv/suv.C
+++ b/cinelerra-5.0/plugins/suv/suv.C
@@ -93,9 +93,9 @@ SUV::SUV()
 
 SUV::~SUV()
 {
+       delete camerakeyframe_data;
        delete channel_position_data;
        delete keyframe_data;
-       delete camerakeyframe_data;
        delete maskkeyframe_data;
        delete modekeyframe_data;
        delete pankeyframe_data;
@@ -301,7 +301,7 @@ void SUV::initialize()
                "dash.png");
 
        resources->bar_data = new_image("bar", "bar.png");
-
+       resources->check = new_image("check", "check.png");
 
        resources->min_menu_w = 96;
        resources->menu_popup_bg = new_image("menu_popup_bg.png");
@@ -585,6 +585,18 @@ void SUV::initialize()
                "labeltoggle_dn.png",
                "label_checkedhi.png");
 
+       ffmpeg_toggle = new_image_set(5,
+               "ff_up.png", 
+               "ff_hi.png", 
+               "ff_checked.png", 
+               "ff_down.png", 
+               "ff_checkedhi.png");
+
+       shbtn_data = new_image_set(3,
+               "shbtn_up.png", 
+               "shbtn_hi.png", 
+               "shbtn_dn.png");
+
        new_image_set("histogram_carrot",
                5,
                "histogram_carrot_up.png",
@@ -791,7 +803,7 @@ void SUV::initialize()
 void SUV::build_bg_data()
 {
 // Audio settings
-       channel_position_data = new VFrame(get_image_data("channel_position.png"));
+       channel_position_data = new VFramePng(get_image_data("channel_position.png"));
 
 // Track bitmaps
        new_image("resource1024", "resource1024.png");
@@ -809,12 +821,12 @@ void SUV::build_bg_data()
 
 void SUV::build_overlays()
 {
-       keyframe_data = new VFrame(get_image_data("keyframe3.png"));
-       camerakeyframe_data = new VFrame(get_image_data("camerakeyframe.png"));
-       maskkeyframe_data = new VFrame(get_image_data("maskkeyframe.png"));
-       modekeyframe_data = new VFrame(get_image_data("modekeyframe.png"));
-       pankeyframe_data = new VFrame(get_image_data("pankeyframe.png"));
-       projectorkeyframe_data = new VFrame(get_image_data("projectorkeyframe.png"));
+       keyframe_data = new VFramePng(get_image_data("keyframe3.png"));
+       camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
+       maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
+       modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+       pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
+       projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
 }