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

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / proxy.h

diff --git a/cinelerra-5.1/cinelerra/proxy.h b/cinelerra-5.1/cinelerra/proxy.h
index c98f2e04a5cea9168e947c39a2c4815919c4c3e5..7fa9fd261fa90840d0a56f3d274728b9599c5b35 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.h
+++ b/cinelerra-5.1/cinelerra/proxy.h
@@ -64,7 +64,7 @@ public:
 class ProxyRender
 {
 public:
-       ProxyRender(MWindow *mwindow, Asset *format_asset);
+       ProxyRender(MWindow *mwindow, Asset *format_asset, int asset_scale);
        ~ProxyRender();
        void to_proxy_path(char *new_path, Indexable *indexable, int scale);
        static int from_proxy_path(char *new_path, Indexable *indexable, int scale);
@@ -88,6 +88,7 @@ public:
        Mutex *counter_lock;
        int total_rendered;
        int failed, canceled;
+       int asset_scale;
 };
 
 class ProxyDialog : public BC_DialogThread
@@ -108,10 +109,9 @@ public:
        Asset *asset;
        ProxyRender *proxy_render;
 
-       int new_scale;
-       int orig_scale;
-       int use_scaler;
-       int auto_scale;
+       int orig_scale, new_scale;
+       int use_scaler, auto_scale;
+       int orig_w, orig_h;
        int beep;
        char *size_text[MAX_SIZES];
        int size_factors[MAX_SIZES];