projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
opengl edge glitch, opengl projector fix, zoom slider, label close fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mbuttons.C
diff --git
a/cinelerra-5.1/cinelerra/mbuttons.C
b/cinelerra-5.1/cinelerra/mbuttons.C
index b5d567ac2d36b123d1b837defd1b8d77961cd7f8..3e650cb6125e6cbe35374bfa28a3db3197c8052a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mbuttons.C
+++ b/
cinelerra-5.1/cinelerra/mbuttons.C
@@
-102,20
+102,6
@@
void MButtons::update()
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
MainTransport::MainTransport(MWindow *mwindow, MButtons *mbuttons, int x, int y)
: PlayTransport(mwindow, mbuttons, x, y)
{
MainTransport::MainTransport(MWindow *mwindow, MButtons *mbuttons, int x, int y)
: PlayTransport(mwindow, mbuttons, x, y)
{
@@
-139,31
+125,37
@@
void MainTransport::goto_end()
}
MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y)
}
MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y)
- : EditPanel(mwindow,
- mbuttons,
- x,
- y,
+ : EditPanel(mwindow, mbuttons, MWINDOW_ID, x, y,
mwindow->edl->session->editing_mode,
mwindow->edl->session->editing_mode,
- 1,
- 1,
- 0,
- 0,
- 1,
- 1,
- 1,
- 1,
- 1,
- 1,
+ 1,
// use_editing_mode
+ 1,
// use_keyframe
+ 0,
// use_splice
+ 0,
// use_overwrite
+ 1,
// use_lift
+ 1,
// use_extract
+ 1,
// use_copy
+ 1,
// use_paste
+ 1,
// use_undo
+ 1,
// use_fit
1, // locklabels
1, // locklabels
- 1,
- 1,
- 0,
- 1,
- 1,
- mwindow->has_commercials())
+ 1, // use_labels
+ 1, // use_toclip
+ 0, // use_meters
+ 1, // use_cut
+ mwindow->has_commercials(), // use_commerical
+ 1, // use_goto
+ 0) // use_clk2play
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
}
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
}
+void MainEditing::to_clip()
+{
+ MWindowGUI *gui = mwindow->gui;
+ gui->unlock_window();
+ mwindow->to_clip(mwindow->edl, _("main window: "), 0);
+ gui->lock_window("MainEditing::to_clip");
+}
+