rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format

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

diff --git a/cinelerra-5.1/cinelerra/resizetrackthread.C b/cinelerra-5.1/cinelerra/resizetrackthread.C
index f8e3de367561a23568d7089204a981b54cfd1d6b..c929c64baad71146680a3f93c2d68e09fc2af5d2 100644 (file)
--- a/cinelerra-5.1/cinelerra/resizetrackthread.C
+++ b/cinelerra-5.1/cinelerra/resizetrackthread.C
@@ -85,7 +85,7 @@ void ResizeVTrackThread::run()
        if(!result) {
                update();
        }
-
+#ifdef GLx4
        if(((w % 4) || (h % 4)) &&
                mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
        {
@@ -93,6 +93,7 @@ void ResizeVTrackThread::run()
                        _("This track's dimensions are not multiples of 4 so\n"
                        "it can't be rendered by OpenGL."));
        }
+#endif
 }
 
 
@@ -329,10 +330,12 @@ void ResizeAssetThread::update()
        char string[BCTEXTLEN];
        asset->width = w;
        asset->height = h;
+       fwindow->lock_window("ResizeAssetThread::update");
        sprintf(string, "%d", asset->width);
        fwindow->win_width->update(string);
        sprintf(string, "%d", asset->height);
        fwindow->win_height->update(string);
+       fwindow->unlock_window();
 }
 
 ResizeAssetButton::ResizeAssetButton(AssetEditWindow *fwindow, int x, int y)