projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
recordmonitor.C
diff --git
a/cinelerra-5.1/cinelerra/recordmonitor.C
b/cinelerra-5.1/cinelerra/recordmonitor.C
index 9c4bf5eeff52c64ca51823eea7e6cae546ee9220..d978466ff06fa8ce2d02a56e3a8b26c298606a8f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/recordmonitor.C
+++ b/
cinelerra-5.1/cinelerra/recordmonitor.C
@@
-1,6
+1,7
@@
/*
* CINELERRA
* Copyright (C) 2011 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2011 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-260,6
+261,8
@@
RecordMonitorGUI::RecordMonitorGUI(MWindow *mwindow,
big_cursor_toggle = 0;
current_operation = MONITOR_NONE;
signal_status = 0;
big_cursor_toggle = 0;
current_operation = MONITOR_NONE;
signal_status = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Capturing and Recording Media");
}
RecordMonitorGUI::~RecordMonitorGUI()
}
RecordMonitorGUI::~RecordMonitorGUI()
@@
-354,7
+357,6
@@
void RecordMonitorGUI::create_objects()
mwindow->theme->rmonitor_canvas_w,
mwindow->theme->rmonitor_canvas_h);
canvas->create_objects(0);
mwindow->theme->rmonitor_canvas_w,
mwindow->theme->rmonitor_canvas_h);
canvas->create_objects(0);
- canvas->use_rwindow();
#ifdef HAVE_DVB
if( driver == CAPTURE_DVB ) {
#ifdef HAVE_DVB
if( driver == CAPTURE_DVB ) {
@@
-527,6
+529,9
@@
int RecordMonitorGUI::keypress_event()
break;
}
break;
}
+ if( !result )
+ result = context_help_check_and_show();
+
return result;
}
return result;
}
@@
-780,6
+785,12
@@
RecordMonitorCanvas::~RecordMonitorCanvas()
{
}
{
}
+void RecordMonitorCanvas::create_objects(EDL *edl)
+{
+ Canvas::create_objects(edl);
+ canvas_menu->add_item(new CanvasPopupResetTranslation(this));
+}
+
int RecordMonitorCanvas::get_output_w()
{
return record->default_asset->width;
int RecordMonitorCanvas::get_output_w()
{
return record->default_asset->width;