X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=dc884e55896a2d0729c7d07a58f15d7ab97dae87;hb=caf23b6b8e0024c33390ddaa165e11956e66f1c2;hp=03c8f22132266cb337352178e5910869503436cb;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 03c8f221..dc884e55 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -120,7 +120,8 @@ AssetVIcon::~AssetVIcon()
 VFrame *AssetVIcon::frame()
 {
 	AssetVIconThread *avt = picon->gui->vicon_thread;
-	Asset *asset = (Asset *)picon->indexable;
+	Indexable *idxbl = picon->indexable;
+	Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 0;
 	if( !asset ) return vframes()>0 ? (VFrame*)*images[0] : 0;
 	if( !asset->video_data && audio_data && audio_size && length > 0 ) {
 		if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
@@ -917,16 +918,25 @@ void AssetPicon::create_objects()
 	int is_clip = 0;
 
 	if( this->indexable ) {
-		fs.extract_name(name, indexable->path);
-		set_text(name);
-		if( this->indexable->is_asset )
+		char *cp = name;
+		if( this->indexable->is_asset ) {
 			asset = (Asset *)indexable;
-		else
+			if( asset->format == FILE_REF ) {
+				cp += sprintf(cp, "ref:");
+				set_color(get_color() ^ 0x5599CC);
+			}
+		}
+		else {
 			edl = (EDL *)indexable;
+			cp += sprintf(cp, "edl:");
+			set_color(get_color() ^ 0xCC9955);
+		}
+		fs.extract_name(cp, indexable->path);
+		set_text(name);
 	}
 	else if( this->edl ) {
 		edl = this->edl;
-		set_text(strcpy(name, edl->local_session->clip_title));
+		strcpy(name, edl->local_session->clip_title);
 		set_text(name);
 		is_clip = 1;
 	}
@@ -1304,6 +1314,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
 	vicon_audio = 0;
 	vicon_drawing = AVICON_FULL_PLAY;
 	play_off = 0;
+	tip_info = 0;
 	displayed_folder = AW_NO_FOLDER;
 	new_folder_thread = 0;
 	modify_folder_thread = 0;
@@ -1898,7 +1909,7 @@ int AWindowGUI::keypress_event()
 			return 1;
 		}
 		unlock_window();
-		mwindow->remove_assets_from_project(1, 1,
+		mwindow->remove_assets_from_project(1, 1, 1,
 			mwindow->session->drag_assets,
 			mwindow->session->drag_clips);
 		lock_window("AWindowGUI::keypress_event 2");