18 new shapewipe transitions from rafa, rework savefile/confirm for nested edl edits

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

diff --git a/cinelerra-5.1/cinelerra/cwindow.h b/cinelerra-5.1/cinelerra/cwindow.h
index e6a9b9448a572d9f57e3f5d5e72a13e7fd85bfca..449cc468ccc2b68c93305285d73def8d812a7d8e 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindow.h
+++ b/cinelerra-5.1/cinelerra/cwindow.h
@@ -49,6 +49,7 @@ public:
                int timebar = 0);
        void run();
        Track* calculate_affected_track();
+       Track* calculate_mask_track();
 // Get keyframe for editing in the CWindow.
 // create - if 0 forces automatic creation to be off
 //          if 1 uses automatic creation option to create
@@ -71,6 +72,7 @@ public:
        void refresh_frame(int change_type, EDL *edl, int dir=1);
 
        int destination;
+       int mask_track_id;
        MWindow *mwindow;
        CWindowGUI *gui;
 
@@ -78,14 +80,18 @@ public:
        CPlayback *playback_engine;
 };
 
-class CWindowRemoteHandler : public RemoteHandler
+class CWindowKeyEvHandler : public RemoteHandler
 {
-       int last_key;
 public:
+       CWindowKeyEvHandler(RemoteControl *remote_control);
+       ~CWindowKeyEvHandler();
+       int remote_key(int key);
        int remote_process_key(RemoteControl *remote_control, int key);
+       int is_keytv() { return 1; }
 
-       CWindowRemoteHandler(RemoteControl *remote_control);
-       ~CWindowRemoteHandler();
+       int key, last_key;
+       RemoteControl *remote_control;
+       MWindow *mwindow;
 };
 
 #endif