X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.h;h=b9191a77c765b09f629a2d6b51f2c9c19a6eb8a1;hb=a6369311556cc1e1877142181d8606e4f68aa803;hp=e0611ecf8ba81d9c5d46b6a7d07388daec49f9c5;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.h b/cinelerra-5.1/cinelerra/assetpopup.h
index e0611ecf..b9191a77 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.h
+++ b/cinelerra-5.1/cinelerra/assetpopup.h
@@ -54,6 +54,7 @@ public:
 	AssetPopupBuildIndex *index;
 	AssetPopupView *view;
 	AssetPopupViewWindow *view_window;
+	AssetPopupMixer *mixer;
 	AWindowListFormat *format;
 };
 
@@ -70,11 +71,23 @@ public:
 	AssetPopup *popup;
 };
 
-class AssetPopupSort : public BC_MenuItem
+class AssetPopupSortNames : public BC_MenuItem
 {
 public:
-	AssetPopupSort(MWindow *mwindow, AssetPopup *popup);
-	~AssetPopupSort();
+	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();
 
 	int handle_event();
 
@@ -120,6 +133,18 @@ public:
 	AssetPopup *popup;
 };
 
+class AssetPopupMixer : public BC_MenuItem
+{
+public:
+	AssetPopupMixer(MWindow *mwindow, AssetPopup *popup);
+	~AssetPopupMixer();
+
+	int handle_event();
+
+	MWindow *mwindow;
+	AssetPopup *popup;
+};
+
 class AssetPopupPaste : public BC_MenuItem
 {
 public:
@@ -206,12 +231,13 @@ public:
 class AssetListCopy : public BC_MenuItem
 {
 public:
-	AssetListCopy(MWindow *mwindow);
+	AssetListCopy(MWindow *mwindow, AWindowGUI *gui);
 	~AssetListCopy();
 
 	int handle_event();
 
 	MWindow *mwindow;
+	AWindowGUI *gui;
 	AssetCopyDialog *copy_dialog;
 };
 
@@ -221,12 +247,13 @@ public:
 	AssetCopyDialog(AssetListCopy *copy);
 	~AssetCopyDialog();
 
-	void start(char *text);
+	void start(char *text, int x, int y);
 	BC_Window* new_gui();
 	void handle_done_event(int result);
 	void handle_close_event(int result);
 
 	char *text;
+	int x, y;
 	AssetListCopy *copy;
 	AssetCopyWindow *copy_window;
 };
@@ -234,10 +261,11 @@ public:
 class AssetCopyWindow : public BC_Window
 {
 public:
-	AssetCopyWindow(AssetCopyDialog *copy_dialog, int x, int y);
+	AssetCopyWindow(AssetCopyDialog *copy_dialog);
 	~AssetCopyWindow();
 
 	void create_objects();
+	int resize_event(int w, int h);
 
 	AssetCopyDialog *copy_dialog;
 	BC_ScrollTextBox *file_list;
@@ -246,12 +274,13 @@ public:
 class AssetListPaste : public BC_MenuItem
 {
 public:
-	AssetListPaste(MWindow *mwindow);
+	AssetListPaste(MWindow *mwindow, AWindowGUI *gui);
 	~AssetListPaste();
 
 	int handle_event();
 
 	MWindow *mwindow;
+	AWindowGUI *gui;
 	AssetPasteDialog *paste_dialog;
 };
 
@@ -264,18 +293,21 @@ public:
 	BC_Window* new_gui();
 	void handle_done_event(int result);
 	void handle_close_event(int result);
+	void start(int x, int y);
 
 	AssetListPaste *paste;
 	AssetPasteWindow *paste_window;
+	int x, y;
 };
 
 class AssetPasteWindow : public BC_Window
 {
 public:
-	AssetPasteWindow(AssetPasteDialog *paste_dialog, int x, int y);
+	AssetPasteWindow(AssetPasteDialog *paste_dialog);
 	~AssetPasteWindow();
 
 	void create_objects();
+	int resize_event(int w, int h);
 
 	AssetPasteDialog *paste_dialog;
 	BC_ScrollTextBox *file_list;