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.h
diff --git
a/cinelerra-5.1/cinelerra/recordmonitor.h
b/cinelerra-5.1/cinelerra/recordmonitor.h
index d109aff5097d5649df5628d9131575a11d3646c4..6d19ad94a34bb4edad3b49e7d4cfb7ba6eef2ce1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/recordmonitor.h
+++ b/
cinelerra-5.1/cinelerra/recordmonitor.h
@@
-2,6
+2,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
@@
-107,7
+108,7
@@
public:
void enable_signal_status(int enable);
MeterPanel *meters;
void enable_signal_status(int enable);
MeterPanel *meters;
- Canvas *canvas;
+
RecordMonitor
Canvas *canvas;
// RecordTransport *record_transport;
#ifdef HAVE_FIREWIRE
AVC1394Transport *avc1394_transport;
// RecordTransport *record_transport;
#ifdef HAVE_FIREWIRE
AVC1394Transport *avc1394_transport;
@@
-221,6
+222,7
@@
public:
Record *record, int x, int y, int w, int h);
~RecordMonitorCanvas();
Record *record, int x, int y, int w, int h);
~RecordMonitorCanvas();
+ void create_objects(EDL *edl);
void zoom_resize_window(float percentage);
int button_press_event();
int button_release_event();
void zoom_resize_window(float percentage);
int button_press_event();
int button_release_event();
@@
-228,11
+230,9
@@
public:
int cursor_enter_event();
void reset_translation();
int keypress_event();
int cursor_enter_event();
void reset_translation();
int keypress_event();
+ int keypress_event(RecordMonitorGUI *window);
int get_output_w();
int get_output_h();
int get_output_w();
int get_output_h();
- int get_fullscreen();
- void set_fullscreen(int value);
-
RecordMonitorGUI *window;
MWindow *mwindow;
RecordMonitorGUI *window;
MWindow *mwindow;