projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
back out dav1d 0.6.0->0.5.1 nasm incompatible most systems, upgrade openexr to 2...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.h
b/cinelerra-5.1/cinelerra/awindowgui.h
index 35fdb9231c796a80ea5b5fd9e0e62d3fd41dc21f..6004247d4f158ec25264b05ff304e8cb6fe22f7a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.h
+++ b/
cinelerra-5.1/cinelerra/awindowgui.h
@@
-131,6
+131,9
@@
public:
int in_use;
int persistent;
time_t comments_time;
int in_use;
int persistent;
time_t comments_time;
+ int comments_ffmt;
+ double comments_rate;
+ const char *comments_type;
double sort_key;
PluginServer *plugin;
Label *label;
double sort_key;
PluginServer *plugin;
Label *label;
@@
-162,6
+165,7
@@
public:
AssetPicon *picon;
VFrame *temp;
int64_t length;
AssetPicon *picon;
VFrame *temp;
int64_t length;
+ int broken;
VFrame *frame();
int64_t set_seq_no(int64_t no);
VFrame *frame();
int64_t set_seq_no(int64_t no);
@@
-182,6
+186,7
@@
public:
int x, int y, int w, int h);
~AssetViewPopup();
int x, int y, int w, int h);
~AssetViewPopup();
+ int reposition_window(int x, int y, int w, int h);
int button_press_event();
int button_release_event();
int cursor_motion_event();
int button_press_event();
int button_release_event();
int cursor_motion_event();
@@
-202,7
+207,7
@@
public:
void set_view_popup(AssetVIcon *v, int draw_mode);
void set_view_popup(AssetVIcon *v);
void set_view_popup(AssetVIcon *v, int draw_mode);
void set_view_popup(AssetVIcon *v);
- ViewPopup *new_view_window();
+ ViewPopup *new_view_window(
ViewPopup *popup
);
void drawing_started();
void drawing_stopped();
void close_view_popup();
void drawing_started();
void drawing_stopped();
void close_view_popup();
@@
-282,11
+287,12
@@
public:
bool protected_pixmap(BC_Pixmap *pixmap);
int save_defaults(BC_Hash *defaults);
int load_defaults(BC_Hash *defaults);
bool protected_pixmap(BC_Pixmap *pixmap);
int save_defaults(BC_Hash *defaults);
int load_defaults(BC_Hash *defaults);
-
void
start_vicon_drawing();
+
int
start_vicon_drawing();
int stop_vicon_drawing();
void close_view_popup();
void update_picon(Indexable *indexable);
int cycle_assetlist_format();
int stop_vicon_drawing();
void close_view_popup();
void update_picon(Indexable *indexable);
int cycle_assetlist_format();
+ void hide_tip_info();
VFrame *get_picon(const char *name, const char *plugin_icons);
VFrame *get_picon(const char *name);
VFrame *get_picon(const char *name, const char *plugin_icons);
VFrame *get_picon(const char *name);
@@
-368,8
+374,9
@@
public:
AVIconDrawing *avicon_drawing;
int avicon_w, avicon_h;
AVIconDrawing *avicon_drawing;
int avicon_w, avicon_h;
- int vicon_drawing;
+ int vicon_drawing
, play_off
;
int allow_iconlisting;
int allow_iconlisting;
+ int tip_info;
// Create custom atoms to be used for async messages between windows
int create_custom_xatoms();
// Create custom atoms to be used for async messages between windows
int create_custom_xatoms();
@@
-402,13
+409,17
@@
public:
int drag_stop_event();
int button_press_event();
int column_resize_event();
int drag_stop_event();
int button_press_event();
int column_resize_event();
- int focus_in_event();
+ int cursor_enter_event();
+ int cursor_leave_event();
int focus_out_event();
void update_vicon_area();
int mouse_over_event(int no);
int focus_out_event();
void update_vicon_area();
int mouse_over_event(int no);
+ void show_tip_info(const char *info, int no);
+ void hide_tip_info();
MWindow *mwindow;
AWindowGUI *gui;
MWindow *mwindow;
AWindowGUI *gui;
+ int info_tip;
};
class AWindowDivider : public BC_SubWindow
};
class AWindowDivider : public BC_SubWindow
@@
-593,8
+604,10
@@
public:
AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text);
~AVIconDrawing();
AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text);
~AVIconDrawing();
- void create_objects();
static const char *avicon_names[];
static const char *avicon_names[];
+ void create_objects();
+ int button_press_event();
+ int draw_face(int dx, int color);
AWindowGUI *agui;
};
AWindowGUI *agui;
};