projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alt transport keys, snap editing, grab focus, inv hilight clr, subtitle fix
[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..5c43fb93da1c49afe173a8970e5e0710cd26925e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-39,7
+39,7
@@
#define PALETTE_DATA "palette.dat"
#define PALETTE_DATA "palette.dat"
-Color
Thread::ColorThread
(int do_alpha, const char *title)
+Color
Picker::ColorPicker
(int do_alpha, const char *title)
: BC_DialogThread()
{
this->title = title;
: BC_DialogThread()
{
this->title = title;
@@
-49,17
+49,17
@@
ColorThread::ColorThread(int do_alpha, const char *title)
this->alpha = 255;
}
this->alpha = 255;
}
-Color
Thread::~ColorThread
()
+Color
Picker::~ColorPicker
()
{
close_window();
}
{
close_window();
}
-void Color
Thread
::start_window(int output, int alpha, int do_okcancel)
+void Color
Picker
::start_window(int output, int alpha, int do_okcancel)
{
if( running() ) {
ColorWindow *gui = (ColorWindow *)get_gui();
if( gui ) {
{
if( running() ) {
ColorWindow *gui = (ColorWindow *)get_gui();
if( gui ) {
- gui->lock_window("Color
Thread
::start_window");
+ gui->lock_window("Color
Picker
::start_window");
gui->raise_window(1);
gui->unlock_window();
}
gui->raise_window(1);
gui->unlock_window();
}
@@
-71,7
+71,7
@@
void ColorThread::start_window(int output, int alpha, int do_okcancel)
start();
}
start();
}
-BC_Window* Color
Thread
::new_gui()
+BC_Window* Color
Picker
::new_gui()
{
char window_title[BCTEXTLEN];
strcpy(window_title, _(PROGRAM_NAME ": "));
{
char window_title[BCTEXTLEN];
strcpy(window_title, _(PROGRAM_NAME ": "));
@@
-92,7
+92,7
@@
BC_Window* ColorThread::new_gui()
return gui;
}
return gui;
}
-void Color
Thread
::update_gui(int output, int alpha)
+void Color
Picker
::update_gui(int output, int alpha)
{
ColorWindow *gui = (ColorWindow *)get_gui();
if( !gui ) return;
{
ColorWindow *gui = (ColorWindow *)get_gui();
if( !gui ) return;
@@
-104,14
+104,14
@@
void ColorThread::update_gui(int output, int alpha)
gui->unlock_window();
}
gui->unlock_window();
}
-int Color
Thread
::handle_new_color(int output, int alpha)
+int Color
Picker
::handle_new_color(int output, int alpha)
{
{
- printf("Color
Thread
::handle_new_color undefined.\n");
+ printf("Color
Picker
::handle_new_color undefined.\n");
return 0;
}
return 0;
}
-ColorWindow::ColorWindow(Color
Thread
*thread, int x, int y, int w, int h, const char *title)
+ColorWindow::ColorWindow(Color
Picker
*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;
: BC_Window(title, x, y, w, h, w, h, 0, 0, 1)
{
this->thread = thread;