projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MatN mods to fix LV2 better and prevent crashes at startup
[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 28bfa9780f6afd4a216e2e4d0c24e8e310dfd428..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();
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
// Get keyframe for editing in the CWindow.
// create - if 0 forces automatic creation to be off
// if 1 uses automatic creation option to create
@@
-59,14
+60,10
@@
public:
int *created = 0,
int redraw = 1);
// Same as before. Provide 0 to Auto arguments to have them ignored.
int *created = 0,
int redraw = 1);
// Same as before. Provide 0 to Auto arguments to have them ignored.
- void calculate_affected_autos(FloatAuto **x_auto,
- FloatAuto **y_auto,
- FloatAuto **z_auto,
- Track *track,
- int use_camera,
- int create_x,
- int create_y,
- int create_z);
+ void calculate_affected_autos( Track *track,
+ FloatAuto **x_auto, FloatAuto **y_auto, FloatAuto **z_auto,
+ int use_camera, int create_x, int create_y, int create_z,
+ int redraw=1);
void show_window();
void hide_window();
int update_position(double position);
void show_window();
void hide_window();
int update_position(double position);
@@
-75,6
+72,7
@@
public:
void refresh_frame(int change_type, EDL *edl, int dir=1);
int destination;
void refresh_frame(int change_type, EDL *edl, int dir=1);
int destination;
+ int mask_track_id;
MWindow *mwindow;
CWindowGUI *gui;
MWindow *mwindow;
CWindowGUI *gui;
@@
-82,14
+80,18
@@
public:
CPlayback *playback_engine;
};
CPlayback *playback_engine;
};
-class CWindow
Remote
Handler : public RemoteHandler
+class CWindow
KeyEv
Handler : public RemoteHandler
{
{
- int last_key;
public:
public:
+ CWindowKeyEvHandler(RemoteControl *remote_control);
+ ~CWindowKeyEvHandler();
+ int remote_key(int key);
int remote_process_key(RemoteControl *remote_control, 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
};
#endif