projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build will not work unless delete the old version because 8 is greater than 1(1)
[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 096182985852ca73a14e846b023b7f98c813aacb..acd11e3883502b866dcc279e831e0acb5bd892ec 100644
(file)
--- a/
cinelerra-5.1/guicast/vicon.h
+++ b/
cinelerra-5.1/guicast/vicon.h
@@
-9,23
+9,21
@@
#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 button_release_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();
};
class VIFrame {
unsigned char *img_data;
~ViewPopup();
};
class VIFrame {
unsigned char *img_data;
- VFrame *vfrm;
public:
VIFrame(int ww, int hh, int vcmdl) {
int size = BC_CModels::calculate_datasize(ww, hh, -1, vcmdl);
public:
VIFrame(int ww, int hh, int vcmdl) {
int size = BC_CModels::calculate_datasize(ww, hh, -1, vcmdl);
@@
-33,14
+31,13
@@
public:
vfrm = new VFrame(img_data, -1, ww, hh, vcmdl, -1);
}
~VIFrame() { delete vfrm; delete [] img_data; }
vfrm = new VFrame(img_data, -1, ww, hh, vcmdl, -1);
}
~VIFrame() { delete vfrm; delete [] img_data; }
-
- operator VFrame *() { return vfrm; }
+ VFrame *vfrm;
};
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;
@@
-54,7
+51,7
@@
public:
void init_audio(int audio_size);
virtual int64_t set_seq_no(int64_t no) { return seq_no = no; }
void init_audio(int audio_size);
virtual int64_t set_seq_no(int64_t no) { return seq_no = no; }
- virtual VFrame *frame() { return
*images[seq_no]
; }
+ virtual VFrame *frame() { return
images[seq_no]->vfrm
; }
virtual int get_vx() { return 0; }
virtual int get_vy() { return 0; }
virtual void load_audio() {}
virtual int get_vx() { return 0; }
virtual int get_vy() { return 0; }
virtual void load_audio() {}
@@
-77,13
+74,16
@@
public:
Timer *timer;
Condition *draw_lock;
ViewPopup *view_win;
Timer *timer;
Condition *draw_lock;
ViewPopup *view_win;
- VIcon *viewing, *vicon;
- int view_w, view_h;
+ VIcon *viewing, *vicon
, *solo
;
+ int v
w, vh, v
iew_w, view_h;
int draw_x0, draw_y0;
int draw_x1, draw_y1;
int img_dirty, win_dirty;
double refresh_rate;
int draw_x0, draw_y0;
int draw_x1, draw_y1;
int img_dirty, win_dirty;
double refresh_rate;
+ int64_t now;
+ int64_t draw_flash;
int64_t stop_age;
int64_t stop_age;
+ int64_t seq_no;
ArrayList<VIcon *>t_heap;
VIcon *low_vicon();
ArrayList<VIcon *>t_heap;
VIcon *low_vicon();
@@
-92,29
+92,30
@@
public:
void run();
void flash();
int draw(VIcon *vicon);
void run();
void flash();
int draw(VIcon *vicon);
- int update_view();
+ int update_view(
int do_audio
);
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 int popup_button_press(int x, int y) { return 0; }
- virtual int popup_button_release(int x, int y) { return 0; }
- virtual int popup_cursor_motion(int x, int y) { return 0; }
+ int show_vicon(VIcon *next);
+ virtual ViewPopup *new_view_window(ViewPopup *vpopup);
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();
};