remove whitespace at eol

[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..adb8d792f1f7727c97028c925b4676872fcce554 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
-       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);
@@ -148,7 +151,7 @@ public:
        long get_compressed_allocated() { return compressed_allocated; }
        long get_compressed_size() { return compressed_size; }
        void set_compressed_size(long size) { compressed_size = size; }
-       double get_timestamp() { return timestamp; } 
+       double get_timestamp() { return timestamp; }
        void set_timestamp(double time) { timestamp = time; }
 
 // return an array of pointers to rows
@@ -213,8 +216,9 @@ public:
 // 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.
@@ -240,8 +244,6 @@ public:
 
 
 
-
-
 // ================================ OpenGL functions ===========================
 // Defined in vframe3d.C
 // Location of working image if OpenGL playback