X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.h;h=cc16c7375d271e623137438dd43432bbb25f6fa8;hb=a0f90514d89589e1136ce90eda493c9545b8f10b;hp=81b2439ff3e30f9fabaa645ea5c16d9a8aa259f8;hpb=a4de4732339bf38b5b225c533be1bdf60748f04a;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/mainsession.h b/cinelerra-5.1/cinelerra/mainsession.h index 81b2439f..cc16c737 100644 --- a/cinelerra-5.1/cinelerra/mainsession.h +++ b/cinelerra-5.1/cinelerra/mainsession.h @@ -49,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; @@ -77,6 +74,7 @@ public: Edits *trim_edits; ArrayList *drag_assets; ArrayList *drag_clips; + ArrayList *drag_proxy; Auto *drag_auto; ArrayList *drag_auto_gang; @@ -173,7 +171,8 @@ public: int cwindow_fullscreen; int rwindow_fullscreen; int vwindow_fullscreen; - + int zwindow_fullscreen; + int selected_zwindow; double actual_frame_rate;