projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove / from shift drop filter, corrent alpha calculation in overlaysample
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
vicon.h
diff --git
a/cinelerra-5.1/guicast/vicon.h
b/cinelerra-5.1/guicast/vicon.h
index 6ae0119e547c7718866f4428fee479ee6b5a866e..6ffe3b174de09e310241f71bed895a0b5e4c2bcc 100644
(file)
--- a/
cinelerra-5.1/guicast/vicon.h
+++ b/
cinelerra-5.1/guicast/vicon.h
@@
-13,7
+13,6
@@
class ViewPopup : public BC_Popup {
public:
VIconThread *vt;
int keypress_event();
public:
VIconThread *vt;
int keypress_event();
- int button_press_event();
void draw_vframe(VFrame *frame);
ViewPopup(VIconThread *vt, VFrame *frame, int x, int y, int w, int h);
void draw_vframe(VFrame *frame);
ViewPopup(VIconThread *vt, VFrame *frame, int x, int y, int w, int h);
@@
-37,22
+36,29
@@
public:
class VIcon
{
public:
class VIcon
{
public:
- int vw, vh, in_use;
+ int vw, vh, 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;
+ int audio_size, playing_audio;
+ uint8_t *audio_data;
int64_t vframes() { return images.size(); }
void reset() { seq_no = 0; cycle_start = 0; age = 0; }
int64_t vframes() { return images.size(); }
void reset() { seq_no = 0; cycle_start = 0; age = 0; }
+ void reset(double rate) { reset(); frame_rate = rate; }
void clear_images() { images.remove_all_objects(); }
void clear_images() { images.remove_all_objects(); }
+ 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 int get_vx() { return 0; }
virtual int get_vy() { return 0; }
virtual int64_t set_seq_no(int64_t no) { return seq_no = no; }
virtual VFrame *frame() { return *images[seq_no]; }
virtual int get_vx() { return 0; }
virtual int get_vy() { return 0; }
+ virtual void load_audio() {}
+ virtual void start_audio() {}
+ virtual void stop_audio() {}
void add_image(VFrame *frm, int ww, int hh, int vcmdl);
void add_image(VFrame *frm, int ww, int hh, int vcmdl);
- void draw_vframe(BC_WindowBase *wdw, int x, int y);
+ void draw_vframe(
VIconThread *vt,
BC_WindowBase *wdw, int x, int y);
void dump(const char *dir);
VIcon(int vw=VICON_WIDTH, int vh=VICON_HEIGHT, double rate=VICON_RATE);
void dump(const char *dir);
VIcon(int vw=VICON_WIDTH, int vh=VICON_HEIGHT, double rate=VICON_RATE);
@@
-69,8
+75,11
@@
public:
ViewPopup *view_win;
VIcon *viewing, *vicon;
int view_w, view_h;
ViewPopup *view_win;
VIcon *viewing, *vicon;
int view_w, view_h;
+ int draw_x0, draw_y0;
+ int draw_x1, draw_y1;
int img_dirty, win_dirty;
double refresh_rate;
int img_dirty, win_dirty;
double refresh_rate;
+ int64_t stop_age;
ArrayList<VIcon *>t_heap;
VIcon *low_vicon();
ArrayList<VIcon *>t_heap;
VIcon *low_vicon();
@@
-86,7
+95,9
@@
public:
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);
+ void set_drawing_area(int x0, int y0, int x1, int y1);
void set_view_popup(VIcon *vicon);
void set_view_popup(VIcon *vicon);
+ void hide_vicons(int v=1);
ViewPopup *new_view_window(VFrame *frame);
virtual bool visible(VIcon *vicon, int x, int y);
ViewPopup *new_view_window(VFrame *frame);
virtual bool visible(VIcon *vicon, int x, int y);