projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change precision on colorpicker hue, rework edl_shared class decls for older cplrs...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
scopewindow.h
diff --git
a/cinelerra-5.1/cinelerra/scopewindow.h
b/cinelerra-5.1/cinelerra/scopewindow.h
index 44b2f8fd80503b803480384d3cc7ceb014a15638..7258374b7680edd89a0fa56c28c2f53cfdc65c3b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/scopewindow.h
+++ b/
cinelerra-5.1/cinelerra/scopewindow.h
@@
-26,6
+26,7
@@
#include "guicast.h"
#include "loadbalance.h"
#include "mwindow.h"
#include "guicast.h"
#include "loadbalance.h"
#include "mwindow.h"
+#include "overlayframe.inc"
#include "pluginclient.h"
#include "recordmonitor.inc"
#include "scopewindow.inc"
#include "pluginclient.h"
#include "recordmonitor.inc"
#include "scopewindow.inc"
@@
-49,7
+50,7
@@
enum {
#define HISTOGRAM_MAX 110
#define FLOAT_MAX 1.1
#define HISTOGRAM_MAX 110
#define FLOAT_MAX 1.1
-#define MIN_SCOPE_W xS(
64
0)
+#define MIN_SCOPE_W xS(
32
0)
#define MIN_SCOPE_H yS(320)
#define MIN_SCOPE_H yS(320)
@@
-167,27
+168,27
@@
public:
};
};
-class ScopeGra
d
Paths : public ArrayList<const char *>
+class ScopeGra
t
Paths : public ArrayList<const char *>
{
public:
{
public:
- ScopeGra
d
Paths() { set_array_delete(); }
- ~ScopeGra
d
Paths() { remove_all_objects(); }
+ ScopeGra
t
Paths() { set_array_delete(); }
+ ~ScopeGra
t
Paths() { remove_all_objects(); }
};
};
-class ScopeGra
d
Item : public BC_MenuItem
+class ScopeGra
t
Item : public BC_MenuItem
{
public:
{
public:
- ScopeGra
dItem(ScopeVectGrads *vect_grad
s, const char *text, int idx);
+ ScopeGra
tItem(ScopeVectGrats *vect_grat
s, const char *text, int idx);
int handle_event();
int handle_event();
- ScopeVectGra
ds *vect_grad
s;
+ ScopeVectGra
ts *vect_grat
s;
int idx;
};
int idx;
};
-class ScopeVectGra
d
s : public BC_PopupMenu
+class ScopeVectGra
t
s : public BC_PopupMenu
{
public:
{
public:
- ScopeVectGra
d
s(ScopeGUI *gui, int x, int y);
+ ScopeVectGra
t
s(ScopeGUI *gui, int x, int y);
void create_objects();
ScopeGUI *gui;
void create_objects();
ScopeGUI *gui;
@@
-279,9
+280,9
@@
public:
void calculate_sizes(int w, int h);
void allocate_vframes();
void draw_overlays(int overlays, int borders, int flush);
void calculate_sizes(int w, int h);
void allocate_vframes();
void draw_overlays(int overlays, int borders, int flush);
- void update_gra
dical
(int idx);
+ void update_gra
ticule
(int idx);
void draw_colorwheel(VFrame *dst, int bg_color);
void draw_colorwheel(VFrame *dst, int bg_color);
- void draw_
gradical
();
+ void draw_
scope
();
void process(VFrame *output_frame);
void draw(int flash, int flush);
void clear_points(int flash);
void process(VFrame *output_frame);
void draw(int flash, int flush);
void clear_points(int flash);
@@
-300,11
+301,10
@@
public:
ScopeMenu *scope_menu;
ScopeWaveSlider *wave_slider;
ScopeVectSlider *vect_slider;
ScopeMenu *scope_menu;
ScopeWaveSlider *wave_slider;
ScopeVectSlider *vect_slider;
- ScopeVectGra
ds *vect_grad
s;
+ ScopeVectGra
ts *vect_grat
s;
ScopeSmooth *smooth;
ScopeSmooth *smooth;
- BC_Title *value_text;
- VFrame *grad_image;
- BC_Pixmap *grad_pixmap;
+ VFrame *grat_image;
+ OverlayFrame *overlay;
int x, y, w, h;
int vector_x, vector_y, vector_w, vector_h;
int x, y, w, h;
int vector_x, vector_y, vector_w, vector_h;
@@
-313,8
+313,8
@@
public:
int hist_x, hist_y, hist_w, hist_h;
int text_color, dark_color;
int hist_x, hist_y, hist_w, hist_h;
int text_color, dark_color;
- ScopeGra
dPaths grad
_paths;
- int gra
d_idx, vector_gradical
;
+ ScopeGra
tPaths grat
_paths;
+ int gra
t_idx, use_graticule
;
int cpus;
int use_hist, use_wave, use_vector;
int cpus;
int use_hist, use_wave, use_vector;