projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
akirad fixups for splash, folders, icons
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
awindowgui.h
diff --git
a/cinelerra-5.0/cinelerra/awindowgui.h
b/cinelerra-5.0/cinelerra/awindowgui.h
index fc03cbc87d0c14d50a3f9912b97443d673dadab9..e3486658adc53717a406cfdf331ebac52f71c8ab 100644
(file)
--- a/
cinelerra-5.0/cinelerra/awindowgui.h
+++ b/
cinelerra-5.0/cinelerra/awindowgui.h
@@
-95,10
+95,11
@@
public:
class AssetVIcon : public VIcon {
public:
AssetPicon *picon;
class AssetVIcon : public VIcon {
public:
AssetPicon *picon;
+ VFrame *temp;
int64_t length;
VFrame *frame();
int64_t length;
VFrame *frame();
- int64_t
next_frame(int n
);
+ int64_t
set_seq_no(int64_t no
);
int get_vx();
int get_vy();
int get_vx();
int get_vy();
@@
-385,10
+386,10
@@
public:
int x, y;
};
int x, y;
};
-class AddTools : public BC_
MenuBar
+class AddTools : public BC_
PopupMenu
{
public:
{
public:
- AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y,
int w
);
+ AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y,
const char *title
);
void create_objects();
MWindow *mwindow;
void create_objects();
MWindow *mwindow;
@@
-396,23
+397,13
@@
public:
AddPluginsMenu *add_plugins;
};
AddPluginsMenu *add_plugins;
};
-class AddPluginsMenu : public BC_Menu
-{
-public:
- AddPluginsMenu(MWindow *mwindow, AWindowGUI *gui);
- void create_objects();
-
- MWindow *mwindow;
- AWindowGUI *gui;
-};
-
class AddPluginItem : public BC_MenuItem
{
public:
class AddPluginItem : public BC_MenuItem
{
public:
- AddPluginItem(Add
PluginsMenu
*menu, const char *text, int idx);
+ AddPluginItem(Add
Tools
*menu, const char *text, int idx);
int handle_event();
int handle_event();
- Add
PluginsMenu
*menu;
+ Add
Tools
*menu;
int idx;
};
int idx;
};