add new boxblur plugin, mods to videoscope, fix segv for menu btns kfrm-tweak/kfrm...

[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 f48df9680ace632a93b2d491f9517688ed7777e8..7f88686dda1b7579a550cbf4a5fe70555525f821 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
@@ -111,7 +112,7 @@ public:
        int orig_scale, new_scale;
        int use_scaler, auto_scale;
        int orig_w, orig_h;
-       int beep;
+       float beep;
        char *size_text[MAX_SIZES];
        int size_factors[MAX_SIZES];
        int total_sizes;
@@ -137,7 +138,7 @@ public:
        ProxyWindow *pwindow;
 };
 
-class ProxyBeepOnDone : public BC_CheckBox
+class ProxyBeepOnDone : public BC_FPot
 {
 public:
        ProxyBeepOnDone(ProxyWindow *pwindow, int x, int y);
@@ -243,24 +244,4 @@ public:
        ArrayList<Asset*> *proxy_assets;
 };
 
-class ProxyBeep : public Thread
-{
-public:
-       enum { BEEP_SAMPLE_RATE=48000 };
-       typedef int16_t audio_data_t;
-       ProxyBeep(MWindow *mwindow);
-       ~ProxyBeep();
-
-       void run();
-       void start();
-       void stop(int wait);
-       void tone(double freq, double secs, double gain);
-
-       MWindow *mwindow;
-       double freq, secs, gain;
-       AudioDevice *audio;
-       int playing_audio, interrupted;
-       int audio_pos;
-};
-
 #endif