X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.h;h=176174f8a1b216555c830a08b9527de2735a2ba0;hb=a50360055eb2afba265a8b61caf857a618044e90;hp=eea5a8eacb6019f2718ff0b75e5c2548ee73152c;hpb=a0ed17a5d6ecf2b010d977bc1f9b7226f24c20f6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.h b/cinelerra-5.1/cinelerra/assetpopup.h
index eea5a8ea..176174f8 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.h
+++ b/cinelerra-5.1/cinelerra/assetpopup.h
@@ -51,12 +51,17 @@ public:
 
 
 	AssetPopupInfo *info;
+	AWindowListFormat *format;
+	AssetPopupOpenEDL *open_edl;
+	AssetPopupCloseEDL *close_edl;
+	AssetPopupToClip *to_clip;
+	AssetPopupSort *sort;
 	AssetPopupBuildIndex *index;
 	AssetPopupView *view;
 	AssetPopupViewWindow *view_window;
 	AssetPopupOpenMixer *open_mixer;
 	AssetPopupInsertMixer *insert_mixer;
-	AWindowListFormat *format;
+	AssetPopupPaste *paste;
 };
 
 class AssetPopupInfo : public BC_MenuItem
@@ -72,6 +77,42 @@ public:
 	AssetPopup *popup;
 };
 
+class AssetPopupOpenEDL : public BC_MenuItem
+{
+public:
+	AssetPopupOpenEDL(MWindow *mwindow, AssetPopup *popup);
+	~AssetPopupOpenEDL();
+
+	int handle_event();
+
+	MWindow *mwindow;
+	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:
+	AssetPopupToClip(MWindow *mwindow, AssetPopup *popup);
+	~AssetPopupToClip();
+
+	int handle_event();
+
+	MWindow *mwindow;
+	AssetPopup *popup;
+};
+
 class AssetPopupSort : public BC_MenuItem
 {
 public:
@@ -228,10 +269,10 @@ public:
 	AWindowGUI *gui;
 	AssetPopupLoadFile *load_file;
 	AWindowListFormat *format;
+	AssetPopupCloseEDL *close_edl;
 	AssetSnapshot *asset_snapshot;
 	AssetGrabshot *asset_grabshot;
 	AssetSelectUsed *select_used;
-	int shots_displayed;
 };
 
 class AssetPopupLoadFile : public BC_MenuItem
@@ -389,40 +430,20 @@ public:
 
 	int handle_event();
 	GrabshotSubMenu *submenu;
-	int mode;
 	GrabshotThread *grab_thread;
+	int mode;
 };
 
-class GrabshotThread : public Thread
+class GrabshotThread : public BC_DragBox
 {
 public:
 	GrabshotThread(MWindow* mwindow);
 	~GrabshotThread();
-
-	MWindow *mwindow;
-	GrabshotPopup *popup;
-	BC_Popup *edge[4];
-	int done;
-
 	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 dragging;
-	int grab_color;
-	int x0, y0, x1, y1;
-	int lx0, ly0, lx1, ly1;
 };
 
 #endif