bg/clr color tweaks, clear borders rework, fc31 depends

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / vdevicex11.C

diff --git a/cinelerra-5.1/cinelerra/vdevicex11.C b/cinelerra-5.1/cinelerra/vdevicex11.C
index ebdb520c57a7a7cfffd7915fa9b61d2d91b084ff..8db5af1fcd224da092a316df9561168ed9a89078 100644 (file)
--- a/cinelerra-5.1/cinelerra/vdevicex11.C
+++ b/cinelerra-5.1/cinelerra/vdevicex11.C
@@ -23,6 +23,7 @@
 #include "autos.h"
 #include "bccapture.h"
 #include "bccmodels.h"
+#include "bcdisplayinfo.h"
 #include "bcsignals.h"
 #include "canvas.h"
 #include "edl.h"
@@ -282,35 +283,8 @@ void VDeviceX11::new_output_buffer(VFrame **result, int file_colormodel, EDL *ed
                                delete bitmap;        bitmap = 0;
                                delete output_frame;  output_frame = 0;
 // Clear borders if size changed
-                               if( size_change ) {
-//printf("VDeviceX11::new_output_buffer %d w=%d h=%d "
-// "canvas_x1=%d canvas_y1=%d canvas_x2=%d canvas_y2=%d\n",
-// __LINE__, // (int)output->w, (int)output->h,
-// (int)canvas_x1, (int)canvas_y1, (int)canvas_x2, (int)canvas_y2);
-                                       window->set_color(BLACK);
-
-                                       if( canvas_y1 > 0 ) {
-                                               window->draw_box(0, 0, output->w, canvas_y1);
-                                               window->flash(0, 0, output->w, canvas_y1);
-                                       }
-
-                                       if( canvas_y2 < output->h ) {
-                                               window->draw_box(0, canvas_y2, output->w, output->h - canvas_y2);
-                                               window->flash(0, canvas_y2, output->w, output->h - canvas_y2);
-                                       }
-
-                                       if( canvas_x1 > 0 ) {
-                                               window->draw_box(0, canvas_y1, canvas_x1, canvas_y2 - canvas_y1);
-                                               window->flash(0, canvas_y1, canvas_x1, canvas_y2 - canvas_y1);
-                                       }
-
-                                       if( canvas_x2 < output->w ) {
-                                               window->draw_box(canvas_x2, canvas_y1,
-                                                       output->w - canvas_x2, canvas_y2 - canvas_y1);
-                                               window->flash(canvas_x2, canvas_y1,
-                                                       output->w - canvas_x2, canvas_y2 - canvas_y1);
-                                       }
-                               }
+                               if( size_change )
+                                       output->clear_borders(edl);
                        }
                }
 
@@ -545,6 +519,7 @@ int VDeviceX11::write_buffer(VFrame *output_channels, EDL *edl)
 void VDeviceX11::clear_output()
 {
        is_cleared = 1;
+// clear front and back buffers
        output->mwindow->playback_3d->clear_output(output, 0);
        output->mwindow->playback_3d->clear_output(output, output_frame);
 }
@@ -580,6 +555,8 @@ void VDeviceX11::do_fade(VFrame *output_temp, float fade)
 
 bool VDeviceX11::can_mask(int64_t start_position_project, MaskAutos *keyframe_set)
 {
+       if( strncmp(BC_DisplayInfo::get_gl_shader_version(), "4.3", 3) < 0 )
+               return 0;
        Auto *current = 0;
        MaskAuto *keyframe = (MaskAuto*)keyframe_set->
                get_prev_auto(start_position_project, PLAY_FORWARD, current);