X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fbinfolder.h;h=142ff380158f3df48f0fff371998c6ed1c59dec8;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hp=f35017a9d1e19919f94938e6c9a8d2b427113706;hpb=c732a0ac2acad5f857d490ce0e7d4f22b41b1b54;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/binfolder.h b/cinelerra-5.1/cinelerra/binfolder.h
index f35017a9..142ff380 100644
--- a/cinelerra-5.1/cinelerra/binfolder.h
+++ b/cinelerra-5.1/cinelerra/binfolder.h
@@ -26,6 +26,7 @@
 #include "awindowgui.inc"
 #include "binfolder.inc"
 #include "datatype.h"
+#include "edl.inc"
 #include "filesystem.h"
 #include "guicast.h"
 #include "indexable.h"
@@ -78,7 +79,7 @@ public:
 class BinFolder
 {
 public:
-	BinFolder(int awindow_folder, const char *title);
+	BinFolder(int awindow_folder, int is_clips, const char *title);
 	BinFolder(BinFolder &that);
 	~BinFolder();
 
@@ -87,10 +88,12 @@ public:
 	int load_xml(FileXML *file);
 	double matches_indexable(Indexable *idxbl);
 	void copy_from(BinFolder *that);
-	void add_patterns(ArrayList<Indexable*> *drag_assets);
+	const char *get_idxbl_title(Indexable *idxbl);
+	int add_patterns(ArrayList<Indexable*> *drag_assets, int use_basename);
 
 	char title[BCSTRLEN];
 	int awindow_folder;
+	int is_clips;
 };
 
 class BinFolders : public ArrayList<BinFolder *>
@@ -550,9 +553,10 @@ public:
 	BC_Window *new_gui();
 	void handle_done_event(int result);
 	void handle_close_event(int result);
-	void start(int x, int y, int w, int h);
+	void start(int x, int y, int w, int h, int is_clips);
 
 	int wx, wy, ww, wh;
+	int is_clips;
 	AWindowGUI *agui;
 	NewFolderGUI *window;
 };
@@ -575,6 +579,7 @@ public:
 	BinFolderAddFilter *add_filter;
 	BinFolderDelFilter *del_filter;
 	BinFolderApplyFilter *apply_filter;
+	BC_Title *text_title;
 	BC_TextBox *text_box;
 	Atom modify_folder_xatom;
 	BC_OKButton *ok_button;
@@ -595,16 +600,18 @@ public:
 	AWindowGUI *agui;
 	BinFolder *original, *folder;
 	ModifyFolderGUI *window;
+	EDL *modify_edl;
 };
 
 
 class ModifyTargetGUI : public BC_Window
 {
 public:
-	ModifyTargetGUI(ModifyTargetThread *thread);
+	ModifyTargetGUI(ModifyTargetThread *thread, int allow_resize=0);
 	~ModifyTargetGUI();
 	virtual void create_objects() {}
 	virtual void update() {}
+	virtual int resize_event(int w, int h);
 	void create_objects(BC_TextBox *&text_box);
 
 	ModifyTargetThread *thread;
@@ -632,9 +639,13 @@ public:
 	ModifyTargetPatternsGUI(ModifyTargetThread *thread);
 	~ModifyTargetPatternsGUI();
 	void create_objects();
+	int resize_event(int w, int h);
 	void update();
 
 	BC_ScrollTextBox *scroll_text_box;
+	BC_OKButton *ok_button;
+	BC_CancelButton *cancel_button;
+	int text_rowsz;
 };
 
 class ModifyTargetFileSizeGUI : public ModifyTargetGUI