nested clips, big rework and cleanup, sams new icons, leaks and tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / clippopup.h

diff --git a/cinelerra-5.1/cinelerra/clippopup.h b/cinelerra-5.1/cinelerra/clippopup.h
index de6d7f6705ded1217c96e18a9ccdc2a892e94802..dba9eab45b9c3ee71c41bf90331e6db120ee5df6 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.h
+++ b/cinelerra-5.1/cinelerra/clippopup.h
@@ -163,11 +163,11 @@ public:
        ClipPopup *popup;
 };
 
-class ClipPopupProjectRemove : public BC_MenuItem
+class ClipPopupDelete : public BC_MenuItem
 {
 public:
-       ClipPopupProjectRemove(MWindow *mwindow, ClipPopup *popup);
-       ~ClipPopupProjectRemove();
+       ClipPopupDelete(MWindow *mwindow, ClipPopup *popup);
+       ~ClipPopupDelete();
 
        int handle_event();
 
@@ -175,17 +175,6 @@ public:
        ClipPopup *popup;
 };
 
-class ClipPopupDiskRemove : public BC_MenuItem
-{
-public:
-       ClipPopupDiskRemove(MWindow *mwindow, ClipPopup *popup);
-       ~ClipPopupDiskRemove();
-
-       int handle_event();
-
-       MWindow *mwindow;
-       ClipPopup *popup;
-};
 
 class ClipPasteToFolder : public BC_MenuItem
 {
@@ -219,4 +208,28 @@ public:
        AWindowGUI *gui;
 };
 
+class ClipPopupNest : public BC_MenuItem
+{
+public:
+       ClipPopupNest(MWindow *mwindow, ClipPopup *popup);
+       ~ClipPopupNest();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       ClipPopup *popup;
+};
+
+class ClipPopupUnNest : public BC_MenuItem
+{
+public:
+       ClipPopupUnNest(MWindow *mwindow, ClipPopup *popup);
+       ~ClipPopupUnNest();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       ClipPopup *popup;
+};
+
 #endif