fixes for errs in nested edl rework, proxy popup delete

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

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index d523779b8f4637d6e4b8eabcc71926e6b33a8667..04170ad18aa45804a51d829b6ca9a2cfe902f04f 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -102,14 +102,22 @@ public:
 // Scale all sample values since everything is locked to audio
        void rechannel();
        void resample(double old_rate, double new_rate, int data_type);
+
        int copy(double start, double end, int all,
                FileXML *file, const char *output_path, int rewind_it);
+       int copy(int all, FileXML *file, const char *output_path, int rewind_it);
+
        int copy_clip(double start, double end, int all,
                FileXML *file, const char *output_path, int rewind_it);
+       int copy_clip(int all, FileXML *file, const char *output_path, int rewind_it);
+
        int copy_nested_edl(double start, double end, int all,
                FileXML *file, const char *output_path, int rewind_it);
+       int copy_nested_edl(int all, FileXML *file, const char *output_path, int rewind_it);
+
        int copy_vwindow_edl(double start, double end, int all,
                FileXML *file, const char *output_path, int rewind_it);
+       int copy_vwindow_edl(int all, FileXML *file, const char *output_path, int rewind_it);
 
        void copy_tracks(EDL *edl);
 // Copies project path, folders, EDLSession, and LocalSession from edl argument.
@@ -181,9 +189,10 @@ public:
        int copy(double start, double end, int all,
                const char *closer, FileXML *file,
                const char *output_path, int rewind_it);
-       EDL *get_nested(EDL *nested_edl, const char *path);
-       EDL *new_nested(EDL *nested_edl, const char *path);
-       void create_nested(EDL *nested_edl, const char *path);
+       void copy_indexables(EDL *edl);
+       EDL *new_nested(EDL *edl, const char *path);
+       EDL *create_nested_clip(EDL *nested);
+       void create_nested(EDL *nested);
        void paste_silence(double start, double end,
                int edit_labels /* = 1 */,
                int edit_plugins,