projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auto keyframe color prefs, colorpicker rework, ru.po update, keyframe align fixes...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.h
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.h
b/cinelerra-5.1/cinelerra/colorpicker.h
index 683fe13578ac33f435b7687094007b216bcaf460..2527f320f4e7315a4191e0c2d95c7cefe41ba47e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.h
+++ b/
cinelerra-5.1/cinelerra/colorpicker.h
@@
-22,6
+22,7
@@
#ifndef COLORPICKER_H
#define COLORPICKER_H
#ifndef COLORPICKER_H
#define COLORPICKER_H
+#include "bcdialog.h"
#include "condition.inc"
#include "guicast.h"
#include "mutex.inc"
#include "condition.inc"
#include "guicast.h"
#include "mutex.inc"
@@
-40,37
+41,26
@@
class PaletteGreen;
class PaletteBlue;
class PaletteAlpha;
class PaletteBlue;
class PaletteAlpha;
-class ColorThread : public Thread
+class ColorThread : public
BC_Dialog
Thread
{
public:
{
public:
- ColorThread(int do_alpha = 0, char *title = 0);
+ ColorThread(int do_alpha = 0, c
onst c
har *title = 0);
~ColorThread();
~ColorThread();
-
- void run();
- void start_window(int output, int alpha);
+ void start_window(int output, int alpha, int do_okcancel=0);
virtual int handle_new_color(int output, int alpha);
void update_gui(int output, int alpha);
virtual int handle_new_color(int output, int alpha);
void update_gui(int output, int alpha);
- ColorWindow* get_gui();
-
-private:
- friend class ColorWindow;
+ BC_Window* new_gui();
- ColorWindow *window;
- Condition *completion;
-// protects window, output, alpha
- Mutex *mutex;
-// Starting color
- int output;
- int alpha;
- int do_alpha;
- char *title;
+ int output, alpha;
+ int do_alpha, do_okcancel;
+ const char *title;
};
class ColorWindow : public BC_Window
{
public:
};
class ColorWindow : public BC_Window
{
public:
- ColorWindow(ColorThread *thread, int x, int y, char *title);
+ ColorWindow(ColorThread *thread, int x, int y,
int w, int h, const
char *title);
void create_objects();
void change_values();
void create_objects();
void change_values();