fix drag handle segv, new app icons

[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 cc16c7375d271e623137438dd43432bbb25f6fa8..a62063959c060751713a25a2708941734a7b3684 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainsession.h
+++ b/cinelerra-5.1/cinelerra/mainsession.h
@@ -49,11 +49,11 @@ 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();
+       Track *drag_handle_track();
 
 // For drag and drop events
 // The entire track where the dropped asset is going to go
@@ -74,7 +74,6 @@ public:
        Edits *trim_edits;
        ArrayList<Indexable*> *drag_assets;
        ArrayList<EDL*> *drag_clips;
-       ArrayList<EDL*> *drag_proxy;
        Auto *drag_auto;
        ArrayList<Auto*> *drag_auto_gang;
 
@@ -137,6 +136,8 @@ public:
        int cswindow_x, cswindow_y, cswindow_w, cswindow_h;
 // subtitle
        int swindow_x, swindow_y, swindow_w, swindow_h;
+// binfolder filter window
+       int bwindow_w, bwindow_h;
 // error window
        int ewindow_w, ewindow_h;
 // Channel edit window
@@ -156,7 +157,6 @@ public:
        int use_hist_parade;
        int use_wave_parade;
 
-
        int afolders_w;
        int show_vwindow, show_awindow, show_cwindow, show_gwindow, show_lwindow;
        int plugindialog_w, plugindialog_h;