X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=32f3d24691dbd12f6d2a290a1fb62fd0f462a3aa;hb=e4db3b86fa63309c123ee1222858cb405b3a448c;hp=b7034d8d16a9cf51f22afea4779462947ad88b65;hpb=4c207ab325a8e8e6b79a9a18d4647273b5f59f93;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index b7034d8d..32f3d246 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -103,6 +103,7 @@
 #include "wwindow.inc"
 #include "wavecache.inc"
 #include "wintv.inc"
+#include "x10tv.inc"
 
 #define FONT_SEARCHPATH "fonts"
 
@@ -548,6 +549,7 @@ public:
 	void redo_entry(BC_WindowBase *calling_window_gui);
 	void save_undo_data();
 	void load_undo_data();
+	void remove_undo_data();
 	int copy_target(const char *path, const char *target);
 	int link_target(const char *real_path, const char *link_path, int relative);
 	void save_project(const char *dir, int save_mode, int overwrite, int reload);
@@ -595,7 +597,7 @@ public:
 	int optimize_assets();            // delete unused assets from the cache and assets
 // render edl assets to specified format, then replace in edl
 	void start_convert(Asset *format_asset, const char *suffix,
-			float beep, int remove_originals);
+			float beep, int to_proxy, int remove_originals);
 	void finish_convert(int remove_originals);
 	ConvertRender *convert_render;
 
@@ -771,6 +773,7 @@ public:
 	void init_signals();
 	void init_shuttle();
 	void init_wintv();
+	void init_x10tv();
 	void init_theme();
 	void init_compositor();
 	void init_levelwindow();
@@ -797,6 +800,7 @@ public:
 	int in_destructor;
 	Shuttle *shuttle;
 	WinTV *wintv;
+	X10TV *x10tv;
 };
 
 #endif