projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add gif ffmpeg format, changes for drag auto color boxes
[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 bab38462b643b284aed7059b0e642e2e6bf510aa..544e1f963031db6e20b85a0a105547821e82569c 100644
(file)
--- a/
cinelerra-5.1/guicast/vicon.h
+++ b/
cinelerra-5.1/guicast/vicon.h
@@
-9,16
+9,16
@@
#include "vicon.inc"
#include "vframe.h"
#include "vicon.inc"
#include "vframe.h"
-typedef void VIconDrawVFrame(BC_WindowBase *wdw, VFrame *frame);
-
class ViewPopup : public BC_Popup {
public:
VIconThread *vt;
class ViewPopup : public BC_Popup {
public:
VIconThread *vt;
- int keypress_event();
- int button_press_event();
- int cursor_motion_event();
+ virtual int keypress_event();
+ virtual int button_press_event() { return 0; }
+ virtual int button_release_event() { return 0; }
+ virtual int cursor_motion_event() { return 0; }
+ virtual void draw_vframe(VFrame *frame);
- 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();
};
@@
-39,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;
@@
-59,8
+59,6
@@
public:
virtual void load_audio() {}
virtual void start_audio() {}
virtual void stop_audio() {}
virtual void load_audio() {}
virtual void start_audio() {}
virtual void stop_audio() {}
- virtual int popup_button_press(int x, int y) { return 0; }
- virtual int popup_cursor_motion(int x, int y) { return 0; }
void add_image(VFrame *frm, int ww, int hh, int vcmdl);
void draw_vframe(VIconThread *vt, BC_WindowBase *wdw, int x, int y);
void add_image(VFrame *frm, int ww, int hh, int vcmdl);
void draw_vframe(VIconThread *vt, BC_WindowBase *wdw, int x, int y);
@@
-79,7
+77,7
@@
public:
Condition *draw_lock;
ViewPopup *view_win;
VIcon *viewing, *vicon;
Condition *draw_lock;
ViewPopup *view_win;
VIcon *viewing, *vicon;
- int view_w, view_h;
+ int v
w, vh, v
iew_w, view_h;
int draw_x0, draw_y0;
int draw_x1, draw_y1;
int img_dirty, win_dirty;
int draw_x0, draw_y0;
int draw_x1, draw_y1;
int img_dirty, win_dirty;
@@
-97,22
+95,25
@@
public:
void draw_images();
void start_drawing();
void stop_drawing();
void draw_images();
void start_drawing();
void stop_drawing();
+ void stop_viewing();
void reset_images();
void remove_vicon(int i);
int keypress_event(int key);
void reset_images();
void remove_vicon(int i);
int keypress_event(int key);
+ int cursor_inside(int x, int y);
void set_drawing_area(int x0, int y0, int x1, int y1);
void set_drawing_area(int x0, int y0, int x1, int y1);
- void set_view_popup(VIcon *vicon, VIconDrawVFrame *draw_vfrm=0);
+ 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);
-
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 void drawing_stopped() {}
virtual bool visible(VIcon *vicon, int x, int y);
virtual void drawing_started() {}
virtual void drawing_stopped() {}
- static VIconDrawVFrame draw_vframe;
- VIconDrawVFrame *draw_vfrm;
- VIconThread(BC_WindowBase *wdw, int vw=4*VICON_WIDTH, int vh=4*VICON_HEIGHT);
+ VIconThread(BC_WindowBase *wdw,
+ int vw=VICON_WIDTH, int vh=VICON_HEIGHT,
+ int view_w=4*VICON_WIDTH, int view_h=4*VICON_HEIGHT);
~VIconThread();
};
~VIconThread();
};