opengl edge glitch, opengl projector fix, zoom slider, label close fix

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

diff --git a/cinelerra-5.1/cinelerra/assetpopup.h b/cinelerra-5.1/cinelerra/assetpopup.h
index 774d84259e2bf689617a6fc83c64841e6ae32ce6..129cd335f0ff29e44c67db6098b4577512c90195 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.h
+++ b/cinelerra-5.1/cinelerra/assetpopup.h
@@ -71,23 +71,11 @@ public:
        AssetPopup *popup;
 };
 
-class AssetPopupSortNames : public BC_MenuItem
+class AssetPopupSort : public BC_MenuItem
 {
 public:
-       AssetPopupSortNames(MWindow *mwindow, AssetPopup *popup);
-       ~AssetPopupSortNames();
-
-       int handle_event();
-
-       MWindow *mwindow;
-       AssetPopup *popup;
-};
-
-class AssetPopupSortTimes : public BC_MenuItem
-{
-public:
-       AssetPopupSortTimes(MWindow *mwindow, AssetPopup *popup);
-       ~AssetPopupSortTimes();
+       AssetPopupSort(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupSort();
 
        int handle_event();
 
@@ -225,12 +213,25 @@ public:
 
        MWindow *mwindow;
        AWindowGUI *gui;
+       AssetPopupLoadFile *load_file;
        AWindowListFormat *format;
        AssetSnapshot *asset_snapshot;
        AssetGrabshot *asset_grabshot;
        int shots_displayed;
 };
 
+class AssetPopupLoadFile : public BC_MenuItem
+{
+public:
+       AssetPopupLoadFile(MWindow *mwindow, AWindowGUI *gui);
+       ~AssetPopupLoadFile();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AWindowGUI *gui;
+};
+
 class AssetListCopy : public BC_MenuItem
 {
 public: