projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subtitle upgrades, textbox fixes/upgrades
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
vframe.h
diff --git
a/cinelerra-5.1/guicast/vframe.h
b/cinelerra-5.1/guicast/vframe.h
index 575968916c302476241c2bd5a7d966a38cd8df5f..dc14dc876f9e17d25df91ac68a01ae153872a7e7 100644
(file)
--- a/
cinelerra-5.1/guicast/vframe.h
+++ b/
cinelerra-5.1/guicast/vframe.h
@@
-131,7
+131,10
@@
public:
// direct copy with no alpha
int copy_from(VFrame *frame);
// BC_CModels::transfer
// direct copy with no alpha
int copy_from(VFrame *frame);
// BC_CModels::transfer
- int transfer_from(VFrame *frame, int bg_color=0);
+ int transfer_from(VFrame *frame, int bg_color, int in_x, int in_y, int in_w, int in_h);
+ int transfer_from(VFrame *frame, int bg_color=0) {
+ return transfer_from(frame, bg_color, 0,0, frame->get_w(),frame->get_h());
+ }
// Required for YUV
int clear_frame();
int allocate_compressed_data(long bytes);
// Required for YUV
int clear_frame();
int allocate_compressed_data(long bytes);
@@
-213,8
+216,9
@@
public:
// Must be called from a synchronous opengl thread after enable_opengl.
void to_texture();
// Must be called from a synchronous opengl thread after enable_opengl.
void to_texture();
-// Transfer from PBuffer to RAM. Only used after Playback3D::overlay_sync
- void to_ram();
+// Transfer from PBuffer to RAM.
+// used in Playback3D::overlay_sync, plugin Overlay::handle_opengl
+ void screen_to_ram();
// Transfer contents of current pbuffer to texture,
// creating a new texture if necessary.
// Transfer contents of current pbuffer to texture,
// creating a new texture if necessary.