improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.h

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 6ba8d504cab7fa8e473e227dbfd0947be5791a54..aa182f9ecf57eb1c6aef9206ba8b400bc3be16ad 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -165,6 +165,7 @@ public:
        AssetPicon *picon;
        VFrame *temp;
        int64_t length;
        AssetPicon *picon;
        VFrame *temp;
        int64_t length;

+       int broken;

 
        VFrame *frame();
        int64_t set_seq_no(int64_t no);
 
        VFrame *frame();
        int64_t set_seq_no(int64_t no);


@@ -207,9 +208,9 @@ public:
        void set_view_popup(AssetVIcon *v, int draw_mode);
        void set_view_popup(AssetVIcon *v);
        ViewPopup *new_view_window(ViewPopup *popup);
        void set_view_popup(AssetVIcon *v, int draw_mode);
        void set_view_popup(AssetVIcon *v);
        ViewPopup *new_view_window(ViewPopup *popup);

+       void stop_vicon_drawing(int wait=0);

        void drawing_started();
        void drawing_stopped();
        void drawing_started();
        void drawing_stopped();

-       void close_view_popup();

 
        AWindowGUI *gui;
        int draw_mode;
 
        AWindowGUI *gui;
        int draw_mode;


@@ -270,7 +271,7 @@ public:
        int drag_stop();
 // Collect items into the drag vectors of MainSession
        void collect_assets(int proxy=0);
        int drag_stop();
 // Collect items into the drag vectors of MainSession
        void collect_assets(int proxy=0);

-       EDL *collect_proxy(Indexable *indexable);
+       EDL *collect_proxy(Asset *asset);

        void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
                int do_audio,
                int do_video,
        void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
                int do_audio,
                int do_video,


@@ -287,8 +288,7 @@ public:
        int save_defaults(BC_Hash *defaults);
        int load_defaults(BC_Hash *defaults);
        int start_vicon_drawing();
        int save_defaults(BC_Hash *defaults);
        int load_defaults(BC_Hash *defaults);
        int start_vicon_drawing();

-       int stop_vicon_drawing();
-       void close_view_popup();
+       int stop_vicon_drawing(int wait=0);

        void update_picon(Indexable *indexable);
        int cycle_assetlist_format();
        void hide_tip_info();
        void update_picon(Indexable *indexable);
        int cycle_assetlist_format();
        void hide_tip_info();