fix mask vframe setup, add unshared vframe constructor

[goodguy/history.git] / cinelerra-5.1 / cinelerra / colorpicker.C

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index c82e728a644618e0c0a54a4019b2e4f4a70a424e..b9db0c76e96a8d4fed7c8ab129e6829b82bbd9ec 100644 (file)
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -21,6 +21,7 @@
 
 #include "bcbutton.h"
 #include "bccapture.h"
+#include "bccolors.h"
 #include "bcdisplayinfo.h"
 #include "colorpicker.h"
 #include "condition.h"
@@ -28,18 +29,15 @@
 #include "language.h"
 #include "mutex.h"
 #include "mwindow.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "vframe.h"
 
 #include <string.h>
 #include <unistd.h>
 
-#undef MSGQUAL
-#define MSGQUAL "colorpicker"
-
 #define PALETTE_DATA "palette.dat"
 
-ColorThread::ColorThread(int do_alpha, const char *title)
+ColorPicker::ColorPicker(int do_alpha, const char *title)
  : BC_DialogThread()
 {
        this->title = title;
@@ -49,17 +47,17 @@ ColorThread::ColorThread(int do_alpha, const char *title)
        this->alpha = 255;
 }
 
-ColorThread::~ColorThread()
+ColorPicker::~ColorPicker()
 {
        close_window();
 }
 
-void ColorThread::start_window(int output, int alpha, int do_okcancel)
+void ColorPicker::start_window(int output, int alpha, int do_okcancel)
 {
        if( running() ) {
                ColorWindow *gui = (ColorWindow *)get_gui();
                if( gui ) {
-                       gui->lock_window("ColorThread::start_window");
+                       gui->lock_window("ColorPicker::start_window");
                        gui->raise_window(1);
                        gui->unlock_window();
                }
@@ -71,7 +69,7 @@ void ColorThread::start_window(int output, int alpha, int do_okcancel)
        start();
 }
 
-BC_Window* ColorThread::new_gui()
+BC_Window* ColorPicker::new_gui()
 {
        char window_title[BCTEXTLEN];
        strcpy(window_title, _(PROGRAM_NAME ": "));
@@ -92,7 +90,7 @@ BC_Window* ColorThread::new_gui()
        return gui;
 }
 
-void ColorThread::update_gui(int output, int alpha)
+void ColorPicker::update_gui(int output, int alpha)
 {
        ColorWindow *gui = (ColorWindow *)get_gui();
        if( !gui ) return;
@@ -104,14 +102,14 @@ void ColorThread::update_gui(int output, int alpha)
        gui->unlock_window();
 }
 
-int ColorThread::handle_new_color(int output, int alpha)
+int ColorPicker::handle_new_color(int output, int alpha)
 {
-       printf("ColorThread::handle_new_color undefined.\n");
+       printf("ColorPicker::handle_new_color undefined.\n");
        return 0;
 }
 
 
-ColorWindow::ColorWindow(ColorThread *thread, int x, int y, int w, int h, const char *title)
+ColorWindow::ColorWindow(ColorPicker *thread, int x, int y, int w, int h, const char *title)
  : BC_Window(title, x, y, w, h, w, h, 0, 0, 1)
 {
        this->thread = thread;
@@ -315,7 +313,7 @@ int ColorWindow::handle_event()
 void ColorWindow::get_screen_sample()
 {
        int cx, cy;
-       get_abs_cursor_xy(cx, cy);
+       get_abs_cursor(cx, cy);
        BC_Capture capture_bitmap(1, 1, 0);
        VFrame vframe(1,1,BC_RGB888);
        capture_bitmap.capture_frame(&vframe, cx,cy);
@@ -580,7 +578,7 @@ PaletteWheelValue::~PaletteWheelValue()
 
 void PaletteWheelValue::create_objects()
 {
-       frame = new VFrame(0, -1, get_w(), get_h(), BC_RGB888, -1);
+       frame = new VFrame(get_w(), get_h(), BC_RGB888);
        draw(window->hsv.h, window->hsv.s, window->hsv.v);
        flash();
 }