projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update, docs Features5 msg/txt, shuttle tweaks for build
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
vicon.h
diff --git
a/cinelerra-5.1/guicast/vicon.h
b/cinelerra-5.1/guicast/vicon.h
index 14f2a99b8e002098fb988d96ececdb9be6a0d719..544e1f963031db6e20b85a0a105547821e82569c 100644
(file)
--- a/
cinelerra-5.1/guicast/vicon.h
+++ b/
cinelerra-5.1/guicast/vicon.h
@@
-17,9
+17,8
@@
public:
virtual int button_release_event() { return 0; }
virtual int cursor_motion_event() { return 0; }
virtual void draw_vframe(VFrame *frame);
virtual int button_release_event() { return 0; }
virtual int cursor_motion_event() { return 0; }
virtual void draw_vframe(VFrame *frame);
- int zoom_scale(int dir);
- ViewPopup(VIconThread *vt,
VFrame *frame,
int x, int y, int w, int h);
+ ViewPopup(VIconThread *vt, int x, int y, int w, int h);
~ViewPopup();
};
~ViewPopup();
};
@@
-40,7
+39,7
@@
public:
class VIcon
{
public:
class VIcon
{
public:
- int
vw, v
h, in_use, hidden;
+ int
w,
h, in_use, hidden;
ArrayList<VIFrame *> images;
int64_t seq_no;
double cycle_start, age, frame_rate;
ArrayList<VIFrame *> images;
int64_t seq_no;
double cycle_start, age, frame_rate;
@@
-103,9
+102,10
@@
public:
int cursor_inside(int x, int y);
void set_drawing_area(int x0, int y0, int x1, int y1);
void set_view_popup(VIcon *vicon);
int cursor_inside(int x, int y);
void set_drawing_area(int x0, int y0, int x1, int y1);
void set_view_popup(VIcon *vicon);
+ int zoom_scale(int dir);
void close_view_popup();
void hide_vicons(int v=1);
void close_view_popup();
void hide_vicons(int v=1);
- virtual ViewPopup *new_view_window(
VFrame *frame
);
+ virtual ViewPopup *new_view_window();
virtual bool visible(VIcon *vicon, int x, int y);
virtual void drawing_started() {}
virtual bool visible(VIcon *vicon, int x, int y);
virtual void drawing_started() {}