projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffmpeg versioning mods from Andrew
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mbuttons.C
diff --git
a/cinelerra-5.1/cinelerra/mbuttons.C
b/cinelerra-5.1/cinelerra/mbuttons.C
index 5aa8677e820325a41dfc825d3e4233dd0fe1f095..7c22885a5345e8ff2a040f3970c8d6301f5d1516 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mbuttons.C
+++ b/
cinelerra-5.1/cinelerra/mbuttons.C
@@
-47,6
+47,8
@@
MButtons::MButtons(MWindow *mwindow, MWindowGUI *gui)
{
this->gui = gui;
this->mwindow = mwindow;
{
this->gui = gui;
this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Transport and Buttons Bar");
}
MButtons::~MButtons()
}
MButtons::~MButtons()
@@
-93,6
+95,11
@@
int MButtons::keypress_event()
result = transport->keypress_event();
}
result = transport->keypress_event();
}
+ if(!result)
+ {
+ result = context_help_check_and_show();
+ }
+
return result;
}
return result;
}
@@
-142,7
+149,10
@@
MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y)
1, // use_cut
mwindow->has_commercials(), // use_commerical
1, // use_goto
1, // use_cut
mwindow->has_commercials(), // use_commerical
1, // use_goto
- 0) // use_clk2play
+ 0, // use_clk2play
+ 0, // use_scope
+ 1, // use_gang_tracks
+ 1) // use_timecode
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
{
this->mwindow = mwindow;
this->mbuttons = mbuttons;
@@
-285,3
+295,8
@@
void MainEditing::panel_set_labels_follow_edits(int v)
mwindow->set_labels_follow_edits(v);
}
mwindow->set_labels_follow_edits(v);
}
+void MainEditing::panel_set_gang_tracks(int v)
+{
+ mwindow->set_gang_tracks(v);
+}
+