X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=ae74854b19e0517640e164b042943dc5a9c97b42;hb=6fae7dd0f56872d524c1a6cf749a15574783f9e8;hp=f7d690acfb89fcf5ba265824d449caf995e037df;hpb=22a5ea2ff7a04c02465dc9b2256f04c38433142e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index f7d690ac..ae74854b 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -29,6 +29,7 @@
 #include "bcsignals.h"
 #include "bchash.h"
 #include "cache.h"
+#include "cstrdup.h"
 #include "clip.h"
 #include "clippopup.h"
 #include "cursors.h"
@@ -105,14 +106,14 @@ VFrame *AssetVIcon::frame()
 			delete temp;  temp = 0;
 		}
 		if( !temp )
-			temp = new VFrame(asset->width, asset->height, BC_RGB888);
+			temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
 		int ww = picon->gui->vicon_thread->view_w;
 		int hh = picon->gui->vicon_thread->view_h;
 		while( seq_no >= images.size() ) {
 			file->set_layer(0);
 			int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
 			file->set_video_position(pos,0);
-			file->read_frame(temp);
+			if( file->read_frame(temp) ) temp->clear_frame();
 			add_image(temp, ww, hh, BC_RGB8);
 		}
 		mwindow->video_cache->check_in(asset);
@@ -221,6 +222,7 @@ void AssetPicon::reset()
 	icon_vframe = 0;
 	vicon = 0;
 	in_use = 1;
+	mtime = 0;
 	id = 0;
 	persistent = 0;
 }
@@ -297,35 +299,36 @@ void AssetPicon::create_objects()
 				else {
 					gui->lock_window("AssetPicon::create_objects 2");
 					icon = gui->video_icon;
-					icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+					icon_vframe = gui->video_vframe;
 				}
 			}
 			else {
 				icon = gui->video_icon;
-				icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+				icon_vframe = gui->video_vframe;
 			}
 		}
 		else
 		if( asset->audio_data ) {
 			icon = gui->audio_icon;
-			icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_SOUND];
+			icon_vframe = gui->audio_vframe;
 		}
-
+		struct stat st;
+		mtime = !stat(asset->path, &st) ? st.st_mtime : 0;
 	}
 	else
 	if( indexable && !indexable->is_asset ) {
 		icon = gui->video_icon;
-		icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+		icon_vframe = gui->video_vframe;
 	}
 	else
 	if( edl ) {
 		set_text(strcpy(name, edl->local_session->clip_title));
 		icon = gui->clip_icon;
-		icon_vframe = mwindow->theme->get_image("clip_icon");
+		icon_vframe = gui->clip_vframe;
 	}
 	else
 	if( plugin ) {
-		strcpy(name,  plugin->title);
+		strcpy(name, _(plugin->title));
 		set_text(name);
 		icon_vframe = plugin->get_picon();
 		if( icon_vframe )
@@ -373,9 +376,7 @@ void AssetPicon::create_objects()
 			      mwindow->edl->session->frames_per_foot);
 		set_text(name);
 		icon = gui->label_icon;
-		icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_LABEL];
-		set_icon(icon);
-		set_icon_vframe(icon_vframe);
+		icon_vframe = gui->label_vframe;
 	}
 	if( !icon ) {
 		icon = gui->file_icon;
@@ -436,6 +437,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
 	labellist_menu = 0;
 	folderlist_menu = 0;
 	temp_picon = 0;
+	search_text = 0;
 	allow_iconlisting = 1;
 	remove_plugin = 0;
 	vicon_thread = 0;
@@ -465,6 +467,7 @@ AWindowGUI::~AWindowGUI()
 	delete cliplist_menu;
 	delete labellist_menu;
 	delete folderlist_menu;
+	delete search_text;
 	delete temp_picon;
 	delete remove_plugin;
 
@@ -614,9 +617,9 @@ void AWindowGUI::create_objects()
 	mwindow->theme->get_awindow_sizes(this);
 	load_defaults(mwindow->defaults);
 
-	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+	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);
+	search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
 	search_text->create_objects();
 	int dy = search_text->get_h() + 10;
 	y1 += dy;  h1 -= dy;
@@ -718,9 +721,9 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
-	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+	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, w1);
+	search_text->reposition_window(x1, y1+5, w1);
 	int dy = search_text->get_h() + 10;
 	y1 += dy;  h1 -= dy;
 	asset_list->reposition_window(x1, y1, w1, h1);
@@ -835,6 +838,7 @@ void AWindowRemovePlugin::handle_close_event(int result)
 {
 	if( !result ) {
 		printf(_("remove %s\n"), plugin->path);
+		awindow->gui->lock_window("AWindowRemovePlugin::handle_close_event");
 		ArrayList<BC_ListBoxItem*> *folder =
 			plugin->audio ? plugin->transition ?
 				&awindow->gui->atransitions :
@@ -844,14 +848,14 @@ void AWindowRemovePlugin::handle_close_event(int result)
 				&awindow->gui->veffects :
 			0;
 		if( folder ) remove_plugin(plugin, *folder);
+		MWindow *mwindow = awindow->mwindow;
+		awindow->gui->unlock_window();
 		char plugin_path[BCTEXTLEN];
 		strcpy(plugin_path, plugin->path);
-		MWindow *mwindow = awindow->mwindow;
 		mwindow->plugindb->remove(plugin);
 		remove(plugin_path);
 		char index_path[BCTEXTLEN];
-		snprintf(index_path, sizeof(index_path), "%s/%s",
-			mwindow->preferences->plugin_dir, PLUGIN_FILE);
+		mwindow->create_defaults_path(index_path, PLUGIN_FILE);
 		remove(index_path);
 		char picon_path[BCTEXTLEN];
 		FileSystem fs;
@@ -943,7 +947,6 @@ void AWindowGUI::async_update_assets()
 
 void AWindowGUI::update_folder_list()
 {
-	stop_vicon_drawing();
 	for( int i = 0; i < folders.total; i++ ) {
 		AssetPicon *picon = (AssetPicon*)folders.values[i];
 		picon->in_use = 0;
@@ -981,8 +984,6 @@ void AWindowGUI::update_folder_list()
 			folders.remove_number(i);
 		}
 	}
-
-	start_vicon_drawing();
 }
 
 void AWindowGUI::create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
@@ -1109,7 +1110,11 @@ void AWindowGUI::update_asset_list()
 		if( !picon->in_use ) {
 			delete picon;
 			assets.remove_number(i);
+			continue;
 		}
+		if( !picon->indexable || !picon->indexable->is_asset ) continue;
+		struct stat st;
+		picon->mtime = !stat(picon->indexable->path, &st) ? st.st_mtime : 0;
 	}
 }
 
@@ -1136,7 +1141,7 @@ void AWindowGUI::update_picon(Indexable *indexable)
 	}
 }
 
-void AWindowGUI::sort_assets()
+void AWindowGUI::sort_assets(int use_mtime)
 {
 	switch( mwindow->edl->session->awindow_folder ) {
 	case AW_AEFFECT_FOLDER:
@@ -1155,7 +1160,7 @@ void AWindowGUI::sort_assets()
 		sort_picons(&labellist);
 		break;
 	default:
-		sort_picons(&assets);
+		sort_picons(&assets, use_mtime);
 	}
 // reset xyposition
 	asset_list->update_format(asset_list->get_format(), 0);
@@ -1198,7 +1203,9 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 		    (picon->indexable && picon->indexable->awindow_folder == folder) ||
 		    (picon->edl && picon->edl->local_session->awindow_folder == folder) ) {
 			const char *text = search_text->get_text();
-			if( text && text[0] && !strstr(picon->get_text(), text) ) continue;
+			int hidden = text && text[0] && !bstrcasestr(picon->get_text(), text);
+			if( picon->vicon ) picon->vicon->hidden = hidden;
+			if( hidden ) continue;
 			BC_ListBoxItem *item2, *item1;
 			dst[0].append(item1 = picon);
 			if( picon->edl )
@@ -1206,6 +1213,14 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 			else
 			if( picon->label && picon->label->textstr )
 				dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr));
+			else if( picon->mtime ) {
+				char date_time[BCSTRLEN];
+				struct tm stm;  localtime_r(&picon->mtime, &stm);
+				sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d",
+					 stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday,
+					 stm.tm_hour, stm.tm_min, stm.tm_sec);
+				dst[1].append(item2 = new BC_ListBoxItem(date_time));
+			}
 			else
 				dst[1].append(item2 = new BC_ListBoxItem(""));
 			item1->set_autoplace_text(1);  item1->set_autoplace_icon(1);
@@ -1214,26 +1229,29 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 	}
 }
 
-void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src)
+void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime)
 {
-	int done = 0;
-	while(!done)
-	{
+	int done = 0, changed = 0;
+	while( !done ) {
 		done = 1;
-		for( int i = 0; i < src->total - 1; i++ ) {
-			BC_ListBoxItem *item1 = src->values[i];
-			BC_ListBoxItem *item2 = src->values[i + 1];
-			item1->set_autoplace_icon(1);
-			item2->set_autoplace_icon(1);
-			item1->set_autoplace_text(1);
-			item2->set_autoplace_text(1);
-			if( strcmp(item1->get_text(), item2->get_text()) > 0 ) {
+		for( int i=0; i<src->total-1; ++i ) {
+			AssetPicon *item1 = (AssetPicon *)src->values[i];
+			AssetPicon *item2 = (AssetPicon *)src->values[i + 1];
+			if( use_mtime ? item1->mtime > item2->mtime :
+			    strcmp(item1->get_text(), item2->get_text()) > 0 ) {
 				src->values[i + 1] = item1;
 				src->values[i] = item2;
-				done = 0;
+				done = 0;  changed = 1;
 			}
 		}
 	}
+	if( changed ) {
+		for( int i=0; i<src->total; ++i ) {
+			AssetPicon *item = (AssetPicon *)src->values[i];
+			item->set_autoplace_icon(1);
+			item->set_autoplace_text(1);
+		}
+	}
 }
 
 
@@ -1279,10 +1297,14 @@ void AWindowGUI::filter_displayed_assets()
 
 void AWindowGUI::update_assets()
 {
+	stop_vicon_drawing();
 	update_folder_list();
 	update_asset_list();
 	labellist.remove_all_objects();
 	create_label_folder();
+
+	if( displayed_folder != mwindow->edl->session->awindow_folder )
+		search_text->clear();
 	filter_displayed_assets();
 
 	if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) {
@@ -1307,6 +1329,7 @@ void AWindowGUI::update_assets()
 	asset_list->center_selection();
 
 	flush();
+	start_vicon_drawing();
 	return;
 }
 
@@ -1537,7 +1560,7 @@ int AWindowAssets::button_press_event()
 			break;
 		case AW_MEDIA_FOLDER:
 		case AW_PROXY_FOLDER:
-			gui->assetlist_menu->update_titles();
+			gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER);
 			gui->assetlist_menu->activate_menu();
 			break;
 		}
@@ -1744,11 +1767,13 @@ int AWindowAssets::drag_stop_event()
 
 	lock_window("AWindowAssets::drag_stop_event");
 
-	if( result ) get_drag_popup()->set_animation(0);
+	if( result )
+		get_drag_popup()->set_animation(0);
 
 	BC_ListBox::drag_stop_event();
-	mwindow->session->current_operation = ::NO_OPERATION; // since NO_OPERATION is also defined in listbox, we have to reach for global scope...
-	return 0;
+// since NO_OPERATION is also defined in listbox, we have to reach for global scope...
+	mwindow->session->current_operation = ::NO_OPERATION;
+	return 1;
 }
 
 int AWindowAssets::column_resize_event()
@@ -1828,6 +1853,11 @@ const char *AWindowSearchText::get_text()
 	return text_box->get_text();
 }
 
+void AWindowSearchText::clear()
+{
+	text_box->update("");
+}
+
 AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->newbin_data)
 {
@@ -2109,7 +2139,7 @@ AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui)
 
 int AWindowListSort::handle_event()
 {
-	gui->sort_assets();
+	gui->sort_assets(0);
 	return 1;
 }