add 2 asset list fmts, user title rework, added show edit, bt tweak

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

diff --git a/cinelerra-5.1/cinelerra/mainsession.h b/cinelerra-5.1/cinelerra/mainsession.h
index de08e5aae9a56f2ea2327ae96067bfd3723f574a..cc16c7375d271e623137438dd43432bbb25f6fa8 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainsession.h
+++ b/cinelerra-5.1/cinelerra/mainsession.h
@@ -38,6 +38,7 @@
 #include "pluginset.inc"
 #include "pluginserver.inc"
 #include "track.inc"
+#include "vwindowgui.inc"
 
 // Options not in EDL but not changed in preferences
 class MainSession
@@ -48,15 +49,12 @@ public:
 
        int load_defaults(BC_Hash *defaults);
        int save_defaults(BC_Hash *defaults);
+       void clear_drag_proxy();
        void save_x11_host(int play_config, const char *x11_host);
        int set_default_x11_host(int win_config=-1);
        void default_window_positions(int window_config=0);
        void boundaries();
 
-
-
-
-
 // For drag and drop events
 // The entire track where the dropped asset is going to go
        Track *track_highlighted;
@@ -66,10 +64,6 @@ public:
        PluginSet *pluginset_highlighted;
 // The plugin after the point where the plugin is going to be dropped.
        Plugin *plugin_highlighted;
-// Viewer canvas highlighted
-       int vcanvas_highlighted;
-// Compositor canvas highlighted
-       int ccanvas_highlighted;
 // Current drag operation
        int current_operation;
 
@@ -80,6 +74,7 @@ public:
        Edits *trim_edits;
        ArrayList<Indexable*> *drag_assets;
        ArrayList<EDL*> *drag_clips;
+       ArrayList<EDL*> *drag_proxy;
        Auto *drag_auto;
        ArrayList<Auto*> *drag_auto_gang;
 
@@ -176,7 +171,8 @@ public:
        int cwindow_fullscreen;
        int rwindow_fullscreen;
        int vwindow_fullscreen;
-
+       int zwindow_fullscreen;
+       int selected_zwindow;
 
        double actual_frame_rate;