upgrade ffmpeg to 3.4.2, add proxy popup, undo/redo deadlock fix, rework nested edl

[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 60784dcf1ebbd53c1f1c46b8272e2b19f9455a07..d523779b8f4637d6e4b8eabcc71926e6b33a8667 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -181,7 +181,9 @@ public:
        int copy(double start, double end, int all,
                const char *closer, FileXML *file,
                const char *output_path, int rewind_it);
-       int to_nested(EDL *nested_edl);
+       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 paste_silence(double start, double end,
                int edit_labels /* = 1 */,
                int edit_plugins,