rework set default transtion, nested proxy edl fixes, doubleclick proxy media fix...

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

diff --git a/cinelerra-5.1/cinelerra/proxy.h b/cinelerra-5.1/cinelerra/proxy.h
index 8726cb78f0793f4dc44adaa89adb78440d803fa4..0db833ea2b87599096eb97e8eeb8ba37eca7e7b3 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.h
+++ b/cinelerra-5.1/cinelerra/proxy.h
@@ -68,7 +68,7 @@ public:
        ProxyRender(MWindow *mwindow, Asset *format_asset);
        ~ProxyRender();
        void to_proxy_path(char *new_path, Indexable *indexable, int scale);
-       static void from_proxy_path(char *new_path, Asset *asset, int scale);
+       static int from_proxy_path(char *new_path, Indexable *indexable, int scale);
 
        ArrayList<Indexable *> orig_idxbls;   // originals which match the proxy assets
        ArrayList<Indexable *> orig_proxies;  // proxy assets