X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=263bbd989621bdfa7e3195084801d4e36939f515;hb=d5a0afb9bc8562f6c2698f88ff40790009a5e63c;hp=070353020f8195996b02b77b0a371d316ca94b38;hpb=3fc547b01e919d3044bacf2a78baddeaed04e3a0;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 07035302..263bbd98 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -120,6 +120,7 @@
 #include "vframe.h"
 #include "vtrack.h"
 #include "versioninfo.h"
+#include "vicon.h"
 #include "videodevice.inc"
 #include "videowindow.h"
 #include "vplayback.h"
@@ -3291,6 +3292,46 @@ void MWindow::hide_keyframe_gui(Plugin *plugin)
 	keyframe_gui_lock->unlock();
 }
 
+int MWindow::get_hash_color(Edit *edit)
+{
+	Indexable *idxbl = edit->asset ?
+		(Indexable*)edit->asset : (Indexable*)edit->nested_edl;
+	if( !idxbl ) return 0;
+	char path[BCTEXTLEN];
+	if( !edit->asset || edit->track->data_type != TRACK_VIDEO ||
+	    edl->session->proxy_scale == 1 ||
+	    ProxyRender::from_proxy_path(path, idxbl, edl->session->proxy_scale) )
+		strcpy(path, idxbl->path);
+	char *cp = strrchr(path, '/');
+	cp = !cp ? path : cp+1;
+	uint8_t *bp = (uint8_t*)cp;
+	int v = 0;
+	while( *bp ) v += *bp++;
+	int hash = 0x303030;
+	if( v & 0x01 ) hash ^= 0x000040;
+	if( v & 0x02 ) hash ^= 0x004000;
+	if( v & 0x04 ) hash ^= 0x400000;
+	if( v & 0x08 ) hash ^= 0x080000;
+	if( v & 0x10 ) hash ^= 0x000800;
+	if( v & 0x20 ) hash ^= 0x000008;
+	if( v & 0x40 ) hash ^= 0x404040;
+	if( v & 0x80 ) hash ^= 0x080808;
+	return hash;
+}
+
+int MWindow::get_title_color(Edit *edit)
+{
+        unsigned color = edit->color;
+	if( !color ) {
+		if( !preferences->autocolor_assets ) return 0;
+		color = get_hash_color(edit);
+	}
+	unsigned alpha = (~edit->color>>24) & 0xff;
+	if( alpha == 0xff )
+		alpha = session->title_bar_alpha*255;
+	return color | (~alpha<<24);
+}
+
 void MWindow::update_keyframe_guis()
 {
 // Send new configuration to keyframe GUI's
@@ -4010,6 +4051,8 @@ void MWindow::remove_asset_from_caches(Asset *asset)
 void MWindow::remove_assets_from_project(int push_undo, int redraw,
 		ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
 {
+	awindow->gui->close_view_popup();
+
 	for(int i = 0; i < drag_assets->total; i++) {
 		Indexable *indexable = drag_assets->get(i);
 		if(indexable->is_asset) remove_asset_from_caches((Asset*)indexable);
@@ -4067,16 +4110,16 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw,
 
 void MWindow::remove_assets_from_disk()
 {
+	remove_assets_from_project(1,
+		1,
+		session->drag_assets,
+		session->drag_clips);
+
 // Remove from disk
 	for(int i = 0; i < session->drag_assets->total; i++)
 	{
 		remove(session->drag_assets->get(i)->path);
 	}
-
-	remove_assets_from_project(1,
-		1,
-		session->drag_assets,
-		session->drag_clips);
 }
 
 void MWindow::dump_plugins(FILE *fp)