X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=e2340d1e4a601c11ef499c79f8b0a7fd339bba93;hp=091fd140e65e75faed556758da8791ea64ef666c;hb=52bb84537e880ea41a6cca9f69bf8d7a8b5cc30f;hpb=c905fabd0678fcc8ab9e32e4443ad8709adafefd

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 091fd140..e2340d1e 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -121,8 +121,7 @@ VFrame *AssetVIcon::frame()
 {
 	AssetVIconThread *avt = picon->gui->vicon_thread;
 	Asset *asset = (Asset *)picon->indexable;
-	if( !asset )
-		return *images[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);
 		temp->clear_frame();
@@ -913,17 +912,26 @@ void AssetPicon::create_objects()
 	int picon_h = mwindow->preferences->awindow_picon_h;
 	pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
 
-	if( indexable ) {
+	Asset *asset = 0;
+	EDL *edl = 0;
+	int is_clip = 0;
+
+	if( this->indexable ) {
 		fs.extract_name(name, indexable->path);
 		set_text(name);
+		if( this->indexable->is_asset )
+			asset = (Asset *)indexable;
+		else
+			edl = (EDL *)indexable;
 	}
-	else if( edl ) {
+	else if( this->edl ) {
+		edl = this->edl;
 		set_text(strcpy(name, edl->local_session->clip_title));
 		set_text(name);
+		is_clip = 1;
 	}
 
-	if( indexable && indexable->is_asset ) {
-		Asset *asset = (Asset*)indexable;
+	if( asset ) {
 		if( asset->video_data ) {
 			if( mwindow->preferences->use_thumbnails ) {
 				gui->unlock_window();
@@ -1068,13 +1076,7 @@ void AssetPicon::create_objects()
 		comments_type = asset->format == FILE_FFMPEG ?
 				asset->vcodec : File::formattostr(asset->format);
 	}
-	else
-	if( indexable && !indexable->is_asset ) {
-		icon = gui->video_icon;
-		icon_vframe = gui->video_vframe;
-	}
-	else
-	if( edl ) {
+	else if( edl ) {
 		if( edl->tracks->playable_video_tracks() ) {
 			if( mwindow->preferences->use_thumbnails ) {
 				gui->unlock_window();
@@ -1082,7 +1084,7 @@ void AssetPicon::create_objects()
 				char clip_icon_path[BCTEXTLEN];
 				char *clip_icon = edl->local_session->clip_icon;
 				VFrame *vframe = 0;
-				if( clip_icon[0] ) {
+				if( is_clip && clip_icon[0] ) {
 					snprintf(clip_icon_path, sizeof(clip_icon_path),
 						"%s/%s", File::get_config_path(), clip_icon);
 					vframe = VFramePng::vframe_png(clip_icon_path);
@@ -1108,7 +1110,7 @@ void AssetPicon::create_objects()
 					close_render_engine();
 					vframe = new VFrame(avt->vw, avt->vh, BC_RGB888);
 					vframe->transfer_from(gui->temp_picon);
-					if( clip_icon[0] )
+					if( this->edl && clip_icon[0] )
 						vframe->write_png(clip_icon_path);
 				}
 				pixmap_w = pixmap_h * width / height;
@@ -1122,10 +1124,14 @@ void AssetPicon::create_objects()
 				icon->draw_vframe(icon_vframe,
 					0, 0, pixmap_w, pixmap_h, 0, 0);
 			}
-			else {
+			else if( is_clip ) {
 				icon = gui->clip_icon;
 				icon_vframe = gui->clip_vframe;
 			}
+			else {
+				icon = gui->video_icon;
+				icon_vframe = gui->video_vframe;
+			}
 		}
 		else
 		if( edl->tracks->playable_audio_tracks() ) {
@@ -1133,7 +1139,7 @@ void AssetPicon::create_objects()
 				gui->unlock_window();
 				char clip_icon_path[BCTEXTLEN];
 				char *clip_icon = edl->local_session->clip_icon;
-				if( clip_icon[0] ) {
+				if( is_clip && clip_icon[0] ) {
 					snprintf(clip_icon_path, sizeof(clip_icon_path),
 						"%s/%s", File::get_config_path(), clip_icon);
 					icon_vframe = VFramePng::vframe_png(clip_icon_path);
@@ -1169,7 +1175,8 @@ void AssetPicon::create_objects()
 							base_colors[i], line_colors[i]);
 					}
 					for( int i=0; i<channels; ++i ) delete samples[i];
-					if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
+					if( is_clip && clip_icon[0] )
+						icon_vframe->write_png(clip_icon_path);
 				}
 				else {
 					pixmap_w = icon_vframe->get_w();
@@ -1179,14 +1186,17 @@ void AssetPicon::create_objects()
 				icon->draw_vframe(icon_vframe,
 					0, 0, pixmap_w, pixmap_h, 0, 0);
 			}
-			else {
+			else if( !indexable ) {
 				icon = gui->clip_icon;
 				icon_vframe = gui->clip_vframe;
 			}
+			else {
+				icon = gui->audio_icon;
+				icon_vframe = gui->audio_vframe;
+			}
 		}
 	}
-	else
-	if( plugin ) {
+	else if( plugin ) {
 		strcpy(name, _(plugin->title));
 		set_text(name);
 		icon_vframe = plugin->get_picon();
@@ -1225,8 +1235,7 @@ void AssetPicon::create_objects()
 			}
 		}
 	}
-	else
-	if( label ) {
+	else if( label ) {
 		Units::totext(name,
 			      label->position,
 			      mwindow->edl->session->time_format,
@@ -1608,6 +1617,7 @@ int AWindowGUI::save_defaults(BC_Hash *defaults)
 {
 	defaults->update("PLUGIN_VISIBILTY", plugin_visibility);
 	defaults->update("VICON_DRAWING", vicon_drawing);
+	defaults->update("TIP_INFO", tip_info);
 	return 0;
 }
 
@@ -1615,6 +1625,7 @@ int AWindowGUI::load_defaults(BC_Hash *defaults)
 {
 	plugin_visibility = defaults->get("PLUGIN_VISIBILTY", plugin_visibility);
 	vicon_drawing = defaults->get("VICON_DRAWING", vicon_drawing);
+	tip_info = defaults->get("TIP_INFO", tip_info);
 	return 0;
 }
 
@@ -1718,6 +1729,12 @@ int AWindowGUI::cycle_assetlist_format()
 	return 1;
 }
 
+void AWindowGUI::hide_tip_info()
+{
+	asset_list->hide_tooltip();
+}
+
+
 AWindowRemovePluginGUI::
 AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
 	int x, int y, PluginServer *plugin)
@@ -1847,6 +1864,10 @@ int AWindowGUI::keypress_event()
 			return 1;
 		}
 		break;
+	case 'i':
+		tip_info = !tip_info ? 1 : 0;
+		if( !tip_info ) hide_tip_info();
+		return 1;
 	case 'o':
 		if( !ctrl_down() && !shift_down() ) {
 			assetlist_menu->load_file->handle_event();
@@ -2562,6 +2583,7 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
+	gui->hide_tip_info();
 	int result = BC_ListBox::button_press_event();
 
 	if( !result ) {
@@ -2683,6 +2705,7 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
+	this->info_tip = -1;
 	set_drag_scroll(0);
 	set_scroll_stretch(1, 1);
 }
@@ -2693,6 +2716,7 @@ AWindowAssets::~AWindowAssets()
 
 int AWindowAssets::button_press_event()
 {
+	hide_tip_info();
 	AssetVIconThread *avt = gui->vicon_thread;
 	if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) {
 		int dir = 1, button = get_buttonpress();
@@ -3040,6 +3064,7 @@ int AWindowAssets::cursor_enter_event()
 
 int AWindowAssets::cursor_leave_event()
 {
+	hide_tip_info();
 	if( !is_event_win() ) return 0;
 	if( !gui->vicon_thread->viewing )
 		gui->stop_vicon_drawing();
@@ -3090,7 +3115,28 @@ int AWindowAssets::mouse_over_event(int no)
 	default:
 		break;
 	}
-	return 0;
+	if( no < 0 && info_tip >= 0 ) {
+		hide_tip_info();
+	}
+	if( gui->tip_info && no >= 0 &&
+	    info_tip != no && picon && picon->plugin ) {
+		const char *info = picon->plugin->tip;
+		if( !info ) info = _("No info available");
+		show_tip_info(info, no);
+	}
+	return 1;
+}
+
+void AWindowAssets::show_tip_info(const char *info, int no)
+{
+	show_tooltip(info);
+	info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+	hide_tooltip();
+	info_tip = -1;
 }