projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clip folder bug on reload, expander user folder drag/drop segv, remove libfdk src...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
editpanel.h
diff --git
a/cinelerra-5.1/cinelerra/editpanel.h
b/cinelerra-5.1/cinelerra/editpanel.h
index 054f6930b8d1cdd10e793daccdc59a16d7a9c286..67ce8a1e67e98cf68831cd5613f7e75249b1fef7 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpanel.h
+++ b/
cinelerra-5.1/cinelerra/editpanel.h
@@
-23,6
+23,7
@@
#define EDITPANEL_H
#include "guicast.h"
#define EDITPANEL_H
#include "guicast.h"
+#include "editpanel.inc"
#include "meterpanel.inc"
#include "mwindow.inc"
#include "manualgoto.inc"
#include "meterpanel.inc"
#include "mwindow.inc"
#include "manualgoto.inc"
@@
-165,6
+166,19
@@
public:
EditPanel *panel;
};
EditPanel *panel;
};
+class EditClick2Play : public BC_Toggle
+{
+public:
+ EditClick2Play(MWindow *mwindow, EditPanel *panel, int x, int y);
+ EditClick2Play();
+
+ int handle_event();
+ int keypress_event();
+
+ MWindow *mwindow;
+ EditPanel *panel;
+};
+
class EditCopy : public BC_Button
{
public:
class EditCopy : public BC_Button
{
public:
@@
-294,11
+308,7
@@
public:
class EditPrevLabel : public BC_Button
{
public:
class EditPrevLabel : public BC_Button
{
public:
- EditPrevLabel(MWindow *mwindow,
- EditPanel *panel,
- int x,
- int y,
- int is_mwindow);
+ EditPrevLabel(MWindow *mwindow, EditPanel *panel, int x, int y);
~EditPrevLabel();
int keypress_event();
~EditPrevLabel();
int keypress_event();
@@
-306,17
+316,12
@@
public:
MWindow *mwindow;
EditPanel *panel;
MWindow *mwindow;
EditPanel *panel;
- int is_mwindow;
};
class EditNextLabel : public BC_Button
{
public:
};
class EditNextLabel : public BC_Button
{
public:
- EditNextLabel(MWindow *mwindow,
- EditPanel *panel,
- int x,
- int y,
- int is_mwindow);
+ EditNextLabel(MWindow *mwindow, EditPanel *panel, int x, int y);
~EditNextLabel();
int keypress_event();
~EditNextLabel();
int keypress_event();
@@
-324,17
+329,12
@@
public:
MWindow *mwindow;
EditPanel *panel;
MWindow *mwindow;
EditPanel *panel;
- int is_mwindow;
};
class EditPrevEdit : public BC_Button
{
public:
};
class EditPrevEdit : public BC_Button
{
public:
- EditPrevEdit(MWindow *mwindow,
- EditPanel *panel,
- int x,
- int y,
- int is_mwindow);
+ EditPrevEdit(MWindow *mwindow, EditPanel *panel, int x, int y);
~EditPrevEdit();
int keypress_event();
~EditPrevEdit();
int keypress_event();
@@
-342,17
+342,12
@@
public:
MWindow *mwindow;
EditPanel *panel;
MWindow *mwindow;
EditPanel *panel;
- int is_mwindow;
};
class EditNextEdit : public BC_Button
{
public:
};
class EditNextEdit : public BC_Button
{
public:
- EditNextEdit(MWindow *mwindow,
- EditPanel *panel,
- int x,
- int y,
- int is_mwindow);
+ EditNextEdit(MWindow *mwindow, EditPanel *panel, int x, int y);
~EditNextEdit();
int keypress_event();
~EditNextEdit();
int keypress_event();
@@
-360,7
+355,6
@@
public:
MWindow *mwindow;
EditPanel *panel;
MWindow *mwindow;
EditPanel *panel;
- int is_mwindow;
};
};
@@
-387,6
+381,7
@@
class KeyFrameButton : public BC_Toggle
public:
KeyFrameButton(MWindow *mwindow, EditPanel *panel, int x, int y);
int handle_event();
public:
KeyFrameButton(MWindow *mwindow, EditPanel *panel, int x, int y);
int handle_event();
+ int keypress_event();
MWindow *mwindow;
EditPanel *panel;
};
MWindow *mwindow;
EditPanel *panel;
};
@@
-403,10
+398,8
@@
public:
class EditPanel
{
public:
class EditPanel
{
public:
- EditPanel(MWindow *mwindow,
- BC_WindowBase *subwindow,
- int x,
- int y,
+ EditPanel(MWindow *mwindow, BC_WindowBase *subwindow,
+ int window_id, int x, int y,
int editing_mode, // From edl.inc
int use_editing_mode,
int use_keyframe,
int editing_mode, // From edl.inc
int use_editing_mode,
int use_keyframe,
@@
-422,9
+415,10
@@
public:
int use_labels,
int use_toclip,
int use_meters,
int use_labels,
int use_toclip,
int use_meters,
- int is_mwindow,
int use_cut,
int use_cut,
- int use_commerical);
+ int use_commerical,
+ int use_goto,
+ int use_clk2play);
~EditPanel();
void set_meters(MeterPanel *meter_panel);
~EditPanel();
void set_meters(MeterPanel *meter_panel);
@@
-432,6
+426,7
@@
public:
static int calculate_h(MWindow *mwindow);
void update();
void create_buttons();
static int calculate_h(MWindow *mwindow);
void update();
void create_buttons();
+ void stop_transport(const char *lock_msg);
void reposition_buttons(int x, int y);
void create_objects();
int get_w();
void reposition_buttons(int x, int y);
void create_objects();
int get_w();
@@
-443,10
+438,10
@@
public:
virtual void unset_inoutpoint();
virtual void to_clip() = 0;
virtual void toggle_label();
virtual void unset_inoutpoint();
virtual void to_clip() = 0;
virtual void toggle_label();
- virtual void prev_label();
- virtual void next_label();
- virtual void prev_edit();
- virtual void next_edit();
+ virtual void prev_label(
int cut
);
+ virtual void next_label(
int cut
);
+ virtual void prev_edit(
int cut
);
+ virtual void next_edit(
int cut
);
virtual double get_position();
virtual void set_position(double position);
virtual double get_position();
virtual void set_position(double position);
@@
-454,9
+449,11
@@
public:
BC_WindowBase *subwindow;
MeterPanel *meter_panel;
BC_WindowBase *subwindow;
MeterPanel *meter_panel;
+ int window_id;
+ int x, y, x1, y1;
+ int editing_mode;
int use_editing_mode;
int use_keyframe;
int use_editing_mode;
int use_keyframe;
- int editing_mode;
int use_splice;
int use_overwrite;
int use_lift;
int use_splice;
int use_overwrite;
int use_lift;
@@
-469,10
+466,10
@@
public:
int use_labels;
int use_toclip;
int use_meters;
int use_labels;
int use_toclip;
int use_meters;
- int x, y, x1, y1;
- int is_mwindow;
int use_cut;
int use_commercial;
int use_cut;
int use_commercial;
+ int use_goto;
+ int use_clk2play;
EditFit *fit;
EditFitAutos *fit_autos;
EditFit *fit;
EditFitAutos *fit_autos;
@@
-485,9
+482,10
@@
public:
EditLift *lift;
EditExtract *extract;
EditToClip *clip;
EditLift *lift;
EditExtract *extract;
EditToClip *clip;
- EditManualGoto *mangoto;
EditCut *cut;
EditCommercial *commercial;
EditCut *cut;
EditCommercial *commercial;
+ EditManualGoto *mangoto;
+ EditClick2Play *click2play;
EditCopy *copy;
EditPaste *paste;
EditLabelbutton *labelbutton;
EditCopy *copy;
EditPaste *paste;
EditLabelbutton *labelbutton;
@@
-502,6
+500,10
@@
public:
IBeamButton *ibeam;
KeyFrameButton *keyframe;
LockLabelsButton *locklabels;
IBeamButton *ibeam;
KeyFrameButton *keyframe;
LockLabelsButton *locklabels;
+
+ int is_mwindow() { return window_id == MWINDOW_ID; }
+ int is_cwindow() { return window_id == CWINDOW_ID; }
+ int is_vwindow() { return window_id == VWINDOW_ID; }
};
#endif
};
#endif