add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...

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

diff --git a/cinelerra-5.1/cinelerra/binfolder.h b/cinelerra-5.1/cinelerra/binfolder.h
index 38b014d43ab2bd540e2175f2b2482ef59a81766d..5bf0a55fc19acc5219501cd8c8221617ef6c559e 100644 (file)
--- a/cinelerra-5.1/cinelerra/binfolder.h
+++ b/cinelerra-5.1/cinelerra/binfolder.h
@@ -78,7 +78,7 @@ public:
 class BinFolder
 {
 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();
 
        BinFolder(BinFolder &that);
        ~BinFolder();
 


@@ -87,10 +87,12 @@ public:
        int load_xml(FileXML *file);
        double matches_indexable(Indexable *idxbl);
        void copy_from(BinFolder *that);
        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);

 
        char title[BCSTRLEN];
        int awindow_folder;
 
        char title[BCSTRLEN];
        int awindow_folder;

+       int is_clips;

 };
 
 class BinFolders : public ArrayList<BinFolder *>
 };
 
 class BinFolders : public ArrayList<BinFolder *>


@@ -550,9 +552,10 @@ public:
        BC_Window *new_gui();
        void handle_done_event(int result);
        void handle_close_event(int result);
        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 wx, wy, ww, wh;

+       int is_clips;

        AWindowGUI *agui;
        NewFolderGUI *window;
 };
        AWindowGUI *agui;
        NewFolderGUI *window;
 };


@@ -575,6 +578,7 @@ public:
        BinFolderAddFilter *add_filter;
        BinFolderDelFilter *del_filter;
        BinFolderApplyFilter *apply_filter;
        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;
        BC_TextBox *text_box;
        Atom modify_folder_xatom;
        BC_OKButton *ok_button;