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

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

diff --git a/cinelerra-5.1/cinelerra/localsession.h b/cinelerra-5.1/cinelerra/localsession.h
index 7c987937cbf15b1da24e421efa7ce4385f7d35b9..cd948aa323176e059895bbf8b20ebc18bc6a76b7 100644 (file)
--- a/cinelerra-5.1/cinelerra/localsession.h
+++ b/cinelerra-5.1/cinelerra/localsession.h
@@ -63,7 +63,6 @@ public:
        void load_xml(FileXML *file, unsigned long load_flags);
        int load_defaults(BC_Hash *defaults);
        int save_defaults(BC_Hash *defaults);
-       void set_clip_path(Indexable *indexable);
 // Used to copy parameters that affect rendering.
        void synchronize_params(LocalSession *that);
 
@@ -78,6 +77,8 @@ public:
 // Title if clip
        char clip_title[BCTEXTLEN];
        char clip_notes[BCTEXTLEN];
+       char clip_icon[BCSTRLEN];
+
 // Folder in parent EDL of clip
        int awindow_folder;