X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=2d09eeb0434a94d283b4c8496645e4c257b71ffb;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hp=f7d43ee92b14de8a9743ab8a2d4eae658b1de55f;hpb=33aae273918725085d841a8af927bfccd2aa9364;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index f7d43ee9..2d09eeb0 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -203,7 +203,7 @@ void MWindow::asset_to_all()
 				}
 			}
 
-
+#ifdef GLx4
 			if( ((edl->session->output_w % 4) ||
 				(edl->session->output_h % 4)) &&
 				edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL ) {
@@ -211,7 +211,7 @@ void MWindow::asset_to_all()
 					_("This project's dimensions are not multiples of 4 so\n"
 					"it can't be rendered by OpenGL."));
 			}
-
+#endif
 // Get aspect ratio
 			if( defaults->get("AUTOASPECT", 0) ) {
 				create_aspect_ratio(
@@ -250,7 +250,7 @@ void MWindow::asset_to_size()
 		h = indexable->get_h();
 		edl->session->output_w = w;
 		edl->session->output_h = h;
-
+#ifdef GLx4
 		if( ((edl->session->output_w % 4) ||
 			(edl->session->output_h % 4)) &&
 			edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL ) {
@@ -258,7 +258,7 @@ void MWindow::asset_to_size()
 				_("This project's dimensions are not multiples of 4 so\n"
 				"it can't be rendered by OpenGL."));
 		}
-
+#endif
 // Get aspect ratio
 		if( defaults->get("AUTOASPECT", 0) ) {
 			create_aspect_ratio(edl->session->aspect_w,
@@ -2457,10 +2457,9 @@ void MWindow::rescale_proxy(EDL *clip, int orig_scale, int new_scale)
 	edl->rescale_proxy(orig_scale, new_scale);
 }
 
-void MWindow::add_proxy(int use_scaler,
-	ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
+void MWindow::add_proxy(ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
 {
-	edl->add_proxy(use_scaler, orig_assets, proxy_assets);
+	edl->add_proxy(orig_assets, proxy_assets);
 }
 
 void MWindow::cut_commercials()