projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
assetpopup.h
diff --git
a/cinelerra-5.1/cinelerra/assetpopup.h
b/cinelerra-5.1/cinelerra/assetpopup.h
index 22624e474bc0bc83633ad00d90f4e6939108cb2d..176174f8a1b216555c830a08b9527de2735a2ba0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/assetpopup.h
+++ b/
cinelerra-5.1/cinelerra/assetpopup.h
@@
-53,6
+53,7
@@
public:
AssetPopupInfo *info;
AWindowListFormat *format;
AssetPopupOpenEDL *open_edl;
AssetPopupInfo *info;
AWindowListFormat *format;
AssetPopupOpenEDL *open_edl;
+ AssetPopupCloseEDL *close_edl;
AssetPopupToClip *to_clip;
AssetPopupSort *sort;
AssetPopupBuildIndex *index;
AssetPopupToClip *to_clip;
AssetPopupSort *sort;
AssetPopupBuildIndex *index;
@@
-88,6
+89,18
@@
public:
AssetPopup *popup;
};
AssetPopup *popup;
};
+class AssetPopupCloseEDL : public BC_MenuItem
+{
+public:
+ AssetPopupCloseEDL(MWindow *mwindow, AWindowGUI *gui);
+ ~AssetPopupCloseEDL();
+
+ int handle_event();
+
+ MWindow *mwindow;
+ AWindowGUI *gui;
+};
+
class AssetPopupToClip : public BC_MenuItem
{
public:
class AssetPopupToClip : public BC_MenuItem
{
public:
@@
-256,10
+269,10
@@
public:
AWindowGUI *gui;
AssetPopupLoadFile *load_file;
AWindowListFormat *format;
AWindowGUI *gui;
AssetPopupLoadFile *load_file;
AWindowListFormat *format;
+ AssetPopupCloseEDL *close_edl;
AssetSnapshot *asset_snapshot;
AssetGrabshot *asset_grabshot;
AssetSelectUsed *select_used;
AssetSnapshot *asset_snapshot;
AssetGrabshot *asset_grabshot;
AssetSelectUsed *select_used;
- int shots_displayed;
};
class AssetPopupLoadFile : public BC_MenuItem
};
class AssetPopupLoadFile : public BC_MenuItem
@@
-417,40
+430,20
@@
public:
int handle_event();
GrabshotSubMenu *submenu;
int handle_event();
GrabshotSubMenu *submenu;
- int mode;
GrabshotThread *grab_thread;
GrabshotThread *grab_thread;
+ int mode;
};
};
-class GrabshotThread : public
Thread
+class GrabshotThread : public
BC_DragBox
{
public:
GrabshotThread(MWindow* mwindow);
~GrabshotThread();
{
public:
GrabshotThread(MWindow* mwindow);
~GrabshotThread();
-
- MWindow *mwindow;
- GrabshotPopup *popup;
- BC_Popup *edge[4];
- int done;
-
void start(GrabshotMenuItem *menu_item);
void start(GrabshotMenuItem *menu_item);
- void run();
-};
+ int handle_done_event(int x0, int y0, int x1, int y1);
-class GrabshotPopup : public BC_Popup
-{
-public:
- GrabshotPopup(GrabshotThread *grab_thread, int mode);
- ~GrabshotPopup();
- int grab_event(XEvent *event);
- void draw_selection(int invert);
- void update();
-
- GrabshotThread *grab_thread;
+ MWindow *mwindow;
int mode;
int mode;
- int dragging;
- int grab_color;
- int x0, y0, x1, y1;
- int lx0, ly0, lx1, ly1;
};
#endif
};
#endif