X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.h;h=b134b910be78a42a17bac33b1f3450d3c05082aa;hp=699d7ac43e8b8786d9e5b5eb921ee38b5b5c493f;hb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;hpb=03fa86e6dc495f9444ae14dad401b1ad6de793fe diff --git a/cinelerra-5.1/cinelerra/proxy.h b/cinelerra-5.1/cinelerra/proxy.h index 699d7ac4..b134b910 100644 --- a/cinelerra-5.1/cinelerra/proxy.h +++ b/cinelerra-5.1/cinelerra/proxy.h @@ -67,7 +67,7 @@ public: 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); + static int from_proxy_path(char *new_path, Asset *asset, int scale); ArrayList orig_idxbls; // originals which match the proxy assets ArrayList orig_proxies; // proxy assets @@ -244,24 +244,4 @@ public: ArrayList *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