X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=32f3d24691dbd12f6d2a290a1fb62fd0f462a3aa;hb=caf23b6b8e0024c33390ddaa165e11956e66f1c2;hp=a38d057d35876af3039d187e09dd61034b061530;hpb=3abbd84aa85907d646b13c98295ce778d2a71215;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index a38d057d..32f3d246 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -102,6 +102,8 @@
 #include "zwindow.inc"
 #include "wwindow.inc"
 #include "wavecache.inc"
+#include "wintv.inc"
+#include "x10tv.inc"
 
 #define FONT_SEARCHPATH "fonts"
 
@@ -109,7 +111,9 @@ class StackItem
 {
 public:
 	EDL *edl, *new_edl;
+	Indexable *idxbl;
 	MainUndo *undo;
+	int64_t mtime;
 };
 
 class Stack : public ArrayList<StackItem>
@@ -170,11 +174,11 @@ public:
 // Total horizontal pixels in timeline
 	int get_tracks_width();
 // session stack
-	void stack_push(EDL *edl);
+	void stack_push(EDL *edl, Indexable *idxbl);
 	void stack_pop();
-	void forget_nested_edl(EDL *nested);
 	void clip_to_media();
 	void media_to_clip();
+	int create_ref(Asset *asset, EDL *ref);
 // Show windows
 	void show_vwindow();
 	void show_awindow();
@@ -269,12 +273,13 @@ public:
 	void tile_mixers();
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
+		int edl_mode = LOADMODE_EDL_CLIP,
 // Cause the project filename on the top of the window to be updated.
 // Not wanted for loading backups.
 		int update_filename = 1);
 
 // Print out plugins which are referenced in the EDL but not loaded.
-	void test_plugins(EDL *new_edl, char *path);
+	void test_plugins(EDL *new_edl, const char *path);
 
 	int interrupt_indexes();  // Stop index building
 
@@ -512,7 +517,7 @@ public:
 	void rebuild_indices();
 // Asset removal from caches
 	void reset_caches();
-	void remove_asset_from_caches(Asset *asset);
+	void remove_from_caches(Indexable *idxbl);
 	void remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
 		ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
 		ArrayList<EDL*> *drag_clips /* mwindow->session->drag_clips */);
@@ -544,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);
@@ -591,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;
 
@@ -766,6 +772,8 @@ public:
 	void init_preferences();
 	void init_signals();
 	void init_shuttle();
+	void init_wintv();
+	void init_x10tv();
 	void init_theme();
 	void init_compositor();
 	void init_levelwindow();
@@ -791,6 +799,8 @@ public:
 	int screens;
 	int in_destructor;
 	Shuttle *shuttle;
+	WinTV *wintv;
+	X10TV *x10tv;
 };
 
 #endif