fixup a bunch of memory use issues

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

diff --git a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C
index a9c6af3830a66ba85dcdacce940ac9db3e8d8a4e..ce0dc0abe62afe2fc93cb0800eaefcd4557380ca 100644 (file)
--- a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C
+++ b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C
@@ -35,7 +35,7 @@
 #include "patchbay.h"
 #include "preferencesthread.h"
 #include "recordgui.h"
-//#include "recordmonitor.h"
+#include "recordmonitor.h"
 #include "setformat.h"
 #include "statusbar.h"
 #include "timebar.h"
@@ -96,6 +96,14 @@ BlueDotTheme::BlueDotTheme()
 
 BlueDotTheme::~BlueDotTheme()
 {
+       delete camerakeyframe_data;
+       delete channel_bg_data;
+       delete channel_position_data;
+       delete keyframe_data;
+       delete maskkeyframe_data;
+       delete modekeyframe_data;
+       delete pankeyframe_data;
+       delete projectorkeyframe_data;
 }
 
 void BlueDotTheme::initialize()
@@ -170,6 +178,62 @@ void BlueDotTheme::initialize()
        // COPIED FROM DEFAULT THEME <<4
        resources->menu_highlighted_fontcolor = DDBLUE;    //Specific to BD
 
+       new_toggle("loadmode_new.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_new");
+       new_toggle("loadmode_none.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_none");
+       new_toggle("loadmode_newcat.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_newcat");
+       new_toggle("loadmode_cat.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_cat");
+       new_toggle("loadmode_newtracks.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_newtracks");
+       new_toggle("loadmode_paste.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_paste");
+       new_toggle("loadmode_resource.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_resource");
+       new_toggle("loadmode_nested.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_nested");
 
 //There are differences here, but we won't change until the end.       
 //Specific to BD
@@ -235,6 +299,31 @@ void BlueDotTheme::initialize()
 
        resources->bar_data = new_image("bar", "bar.png");
 
+       //clock font
+       resources->medium_7segment =  new_image_set(20,
+               "black_0.png",
+               "black_1.png",
+               "black_2.png",
+               "black_3.png",
+               "black_4.png",
+               "black_5.png",
+               "black_6.png",
+               "black_7.png",
+               "black_8.png",
+               "black_9.png",
+               "black_colon.png",
+               "black_period.png",
+               "black_a.png",
+               "black_b.png",
+               "black_c.png",
+               "black_d.png",
+               "black_e.png",
+               "black_f.png",
+               "black_space.png",
+               "black_dash.png");      
+
+       resources->bar_data = new_image("bar", "bar.png");
+       resources->check = new_image("check", "check.png");
 
        resources->min_menu_w = 0;
        resources->menu_popup_bg = 0;  // if (0) use menu_light, menu_up, menu_shadow
@@ -472,9 +561,6 @@ void BlueDotTheme::initialize()
        new_image("new_bg", "new_bg.png");
        new_image("setformat_bg", "setformat_bg2.png");
 
-
-       timebar_view_data = new_image("timebar_view.png");
-
 // x, y of Format dialog box
        setformat_w = 600;
        setformat_h = 560;
@@ -573,6 +659,17 @@ void BlueDotTheme::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");
 
        statusbar_cancel_data = new_image_set(3,
                "statusbar_cancel_up.png",
@@ -779,11 +876,6 @@ void BlueDotTheme::initialize()
 //Specific to BD
        resources->audiovideo_color = DKGREY;
 
-//Specific to BD - Copied from Blonde, replace letters
-       //clock font
-       resources->medium_7segment =  new_image_set(20,
-               "black_0.png", "black_1.png",  "black_2.png",  "black_3.png",  "black_4.png",  "black_5.png",  "black_6.png",  "black_7.png",  "black_8.png",  "black_9.png",  "black_colon.png",    "black_period.png",    "black_a.png",  "black_b.png",  "black_c.png",  "black_d.png",  "black_e.png",  "black_f.png",  "black_space.png",  "black_dash.png");      
-
 //Specific to BD
        //tooltip
        resources->tooltip_bg_color = 0xfff7e3;
@@ -1041,8 +1133,8 @@ void BlueDotTheme::build_icons()
 void BlueDotTheme::build_bg_data()
 {
 // Audio settings
-       channel_bg_data = new VFrame(get_image_data("channel_bg.png"));
-       channel_position_data = new VFrame(get_image_data("channel_position.png"));
+       channel_bg_data = new VFramePng(get_image_data("channel_bg.png"));
+       channel_position_data = new VFramePng(get_image_data("channel_position.png"));
 
 // Track bitmaps
        new_image("resource1024", "resource1024.png");
@@ -1061,12 +1153,12 @@ void BlueDotTheme::build_bg_data()
 //Graphic Copied from default. Improve!!  -- use your imagination
 void BlueDotTheme::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"));
 }