X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.h;h=b134b910be78a42a17bac33b1f3450d3c05082aa;hb=abdff69b9309c7d5cd2ed6ce17dd2e0d85aef9a1;hp=7fa9fd261fa90840d0a56f3d274728b9599c5b35;hpb=ac8f3979437fb45effb135a1bb6bee871f52d635;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/proxy.h b/cinelerra-5.1/cinelerra/proxy.h
index 7fa9fd26..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<Indexable *> orig_idxbls;   // originals which match the proxy assets
 	ArrayList<Indexable *> orig_proxies;  // proxy assets
@@ -112,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;
@@ -138,7 +138,7 @@ public:
 	ProxyWindow *pwindow;
 };
 
-class ProxyBeepOnDone : public BC_CheckBox
+class ProxyBeepOnDone : public BC_FPot
 {
 public:
 	ProxyBeepOnDone(ProxyWindow *pwindow, int x, int y);
@@ -244,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