X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=a8e6c002832fa14cbcf06d1f3820f0f4d5d27877;hb=9e3d90a964c0fbe97c0b58235336a47111932d5d;hp=0caedce4747cdfceaa72ad26e3f403f7626e4e3c;hpb=686bc04a488847170d80ec603f8c33962a7aa928;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 0caedce4..a8e6c002 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -109,6 +109,7 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_
 	this->picon = picon;
 	this->length = length;
 	temp = 0;
+	broken = 0;
 }
 
 AssetVIcon::~AssetVIcon()
@@ -119,10 +120,11 @@ AssetVIcon::~AssetVIcon()
 
 VFrame *AssetVIcon::frame()
 {
+	if( broken ) return 0;
 	AssetVIconThread *avt = picon->gui->vicon_thread;
-	Asset *asset = (Asset *)picon->indexable;
-	if( !asset )
-		return *images[0];
+	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);
 		temp->clear_frame();
@@ -161,7 +163,10 @@ VFrame *AssetVIcon::frame()
 	if( seq_no >= images.size() ) {
 		MWindow *mwindow = picon->mwindow;
 		File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
-		if( !file ) return 0;
+		if( !file ) {
+			broken = 1;
+			return 0;
+		}
 		if( temp && (temp->get_w() != asset->width || temp->get_h() != asset->height) ) {
 			delete temp;  temp = 0;
 		}
@@ -913,17 +918,35 @@ void AssetPicon::create_objects()
 	int picon_h = mwindow->preferences->awindow_picon_h;
 	pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
 
-	if( indexable ) {
-		fs.extract_name(name, indexable->path);
+	Asset *asset = 0;
+	EDL *edl = 0;
+	int is_clip = 0;
+
+	if( this->indexable ) {
+		char *cp = name;
+		if( this->indexable->is_asset ) {
+			asset = (Asset *)indexable;
+			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( edl ) {
-		set_text(strcpy(name, edl->local_session->clip_title));
+	else if( this->edl ) {
+		edl = this->edl;
+		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 +1091,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 +1099,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 +1125,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 +1139,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 +1154,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 +1190,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 +1201,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 +1250,7 @@ void AssetPicon::create_objects()
 			}
 		}
 	}
-	else
-	if( label ) {
+	else if( label ) {
 		Units::totext(name,
 			      label->position,
 			      mwindow->edl->session->time_format,
@@ -1249,7 +1273,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
  : BC_Window(_(PROGRAM_NAME ": Resources"),
 	mwindow->session->awindow_x, mwindow->session->awindow_y,
 	mwindow->session->awindow_w, mwindow->session->awindow_h,
-	100, 100, 1, 1, 1)
+	xS(100), yS(100), 1, 1, 1)
 {
 	this->mwindow = mwindow;
 	this->awindow = awindow;
@@ -1295,6 +1319,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;
@@ -1413,6 +1438,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un
 
 void AWindowGUI::create_objects()
 {
+	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("AWindowGUI::create_objects");
 	asset_titles[0] = C_("Title");
 	asset_titles[1] = _("Comments");
@@ -1473,9 +1499,9 @@ void AWindowGUI::create_objects()
 
 	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
 	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-	search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
+	search_text = new AWindowSearchText(mwindow, this, x1, y1+ys5);
 	search_text->create_objects();
-	int dy = search_text->get_h() + 10;
+	int dy = search_text->get_h() + ys10;
 	y1 += dy;  h1 -= dy;
 	add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
@@ -1498,7 +1524,7 @@ void AWindowGUI::create_objects()
 		int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
 		if( tw < nw )  tw = nw;
 	}
-	int pw = BC_PopupMenu::calculate_w(16, tw, 1);
+	int pw = BC_PopupMenu::calculate_w(xS(16), tw, 1);
 	const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
 	add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
 	avicon_drawing->create_objects();
@@ -1587,10 +1613,11 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
+	int ys5 = yS(5), ys10 = yS(10);
 	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
 	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-	search_text->reposition_window(x1, y1+5, w1);
-	int dy = search_text->get_h() + 10;
+	search_text->reposition_window(x1, y1+ys5, w1);
+	int dy = search_text->get_h() + ys10;
 	y1 += dy;  h1 -= dy;
 	asset_list->reposition_window(x1, y1, w1, h1);
 	divider->reposition_window(
@@ -1608,6 +1635,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 +1643,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,10 +1747,18 @@ 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)
- : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, 500,200, 50, 50, 1, 0, 1, -1, "", 1)
+ : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y,
+		xS(500),yS(200), xS(50), yS(50),
+		1, 0, 1, -1, "", 1)
 {
 	this->awindow = awindow;
 	this->thread = thread;
@@ -1741,17 +1778,19 @@ AWindowRemovePluginGUI::
 
 void AWindowRemovePluginGUI::create_objects()
 {
+	int xs10 = xS(10), xs20 = xS(20);
+	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("AWindowRemovePluginGUI::create_objects");
 	BC_Button *ok_button = new BC_OKButton(this);
 	add_subwindow(ok_button);
 	BC_Button *cancel_button = new BC_CancelButton(this);
 	add_subwindow(cancel_button);
-	int x = 10, y = 10;
+	int x = xs10, y = ys10;
 	BC_Title *title = new BC_Title(x, y, _("remove plugin?"));
 	add_subwindow(title);
-	y += title->get_h() + 5;
+	y += title->get_h() + ys5;
 	list = new BC_ListBox(x, y,
-		get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list,
+		get_w() - xs20, ok_button->get_y() - y - ys5, LISTBOX_TEXT, &plugin_list,
 		0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
 	add_subwindow(list);
 	show_window();
@@ -1847,6 +1886,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();
@@ -1871,7 +1914,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");
@@ -2475,7 +2518,7 @@ int AWindowDivider::button_press_event()
 int AWindowDivider::cursor_motion_event()
 {
 	if( mwindow->session->current_operation == DRAG_PARTITION ) {
-		int wmin = 25;
+		int wmin = xS(25);
 		int wmax = mwindow->session->awindow_w - mwindow->theme->adivider_w - wmin;
 		int fw = gui->get_relative_cursor_x();
 		if( fw > wmax ) fw = wmax;
@@ -2562,6 +2605,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 +2727,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 +2738,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();
@@ -2839,7 +2885,8 @@ int AWindowAssets::selection_changed()
 			case AW_CLIP_FOLDER:
 				if( get_buttonpress() == LEFT_BUTTON ) {
 					AssetVIcon *vicon = 0;
-					if( !gui->vicon_thread->vicon )
+					AssetVIconThread *avt = gui->vicon_thread;
+					if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
 						vicon = item->vicon;
 					gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
 				}
@@ -2862,7 +2909,7 @@ void AWindowAssets::draw_background()
 	set_font(LARGEFONT);
 	int folder = mwindow->edl->session->awindow_folder;
 	const char *title = mwindow->edl->get_folder_name(folder);
-	draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30,
+	draw_text(get_w() - get_text_width(LARGEFONT, title) - xS(4), yS(30),
 		title, -1, get_bg_surface());
 }
 
@@ -3039,6 +3086,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();
@@ -3089,7 +3137,32 @@ 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)
+{
+	int tw = get_text_width(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+	int th = get_text_height(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+	int tx = get_w() - (tw + xS(28));
+	int ty = get_h() - (th + yS(28));
+	show_tooltip(info, tx, ty, tw, th);
+	info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+	hide_tooltip();
+	info_tip = -1;
 }
 
 
@@ -3114,10 +3187,11 @@ AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, i
 
 void AWindowSearchText::create_objects()
 {
-	int x1 = x, y1 = y, margin = 10;
+	int xs10 = xS(10);
+	int x1 = x, y1 = y;
 	gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:")));
-	x1 += text_title->get_w() + margin;
-	int w1 = gui->get_w() - x1 - 2*margin;
+	x1 += text_title->get_w() + xs10;
+	int w1 = gui->get_w() - x1 - 2*xs10;
 	gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
 }
 
@@ -3129,7 +3203,7 @@ int AWindowSearchText::handle_event()
 
 int AWindowSearchText::get_w()
 {
-	return text_box->get_w() + text_title->get_w() + 10;
+	return text_box->get_w() + text_title->get_w() + xS(10);
 }
 
 int AWindowSearchText::get_h()
@@ -3139,10 +3213,11 @@ int AWindowSearchText::get_h()
 
 void AWindowSearchText::reposition_window(int x, int y, int w)
 {
-	int x1 = x, y1 = y, margin = 10;
+	int xs10 = xS(10);
+	int x1 = x, y1 = y;
 	text_title->reposition_window(x1, y1);
-	x1 += text_title->get_w() + margin;
-	int w1 = gui->get_w() - x1 - 2*margin;
+	x1 += text_title->get_w() + xs10;
+	int w1 = gui->get_w() - x1 - 2*xs10;
 	text_box->reposition_window(x1, y1, w1);
 }