X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=218523974a544449663271b79888c6afc7163c59;hp=1ab6ea1affe3b65c6a63ad6a95a9ba8592a0cdd3;hb=ae44cc4a24c9e04ee5e3b38baf6ce529832cfb39;hpb=7e5a0760f40ff787cc3d93cb7768a901ebe52809

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 1ab6ea1a..21852397 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -300,9 +300,51 @@ void AssetVIcon::stop_audio()
 	playing_audio = 0;
 }
 
+
+AWindowFolderItem::AWindowFolderItem()
+ : BC_ListBoxItem()
+{
+	parent = 0;
+}
+
+AWindowFolderItem::AWindowFolderItem(const char *text, int color)
+ : BC_ListBoxItem(text, color)
+{
+	parent = 0;
+}
+
+AWindowFolderItem::AWindowFolderItem(const char *text, BC_Pixmap *icon, int color)
+ : BC_ListBoxItem(text, icon, color)
+{
+	parent = 0;
+}
+
+AssetPicon *AWindowFolderItem::get_picon()
+{
+	AWindowFolderItem *item = this;
+	while( item->parent ) { item = (AWindowFolderItem*)item->parent; }
+	return (AssetPicon*)item;
+}
+
+int AWindowFolderSubItems::matches(const char *text)
+{
+	int i = names.size();
+	while( --i >= 0 && strcmp(names[i], text) );
+	if( i < 0 ) {
+		ArrayList<BC_ListBoxItem *> *sublist = get_sublist();
+		i = sublist ? sublist->size() : 0;
+		while( --i >= 0 ) {
+			AWindowFolderSubItems *item = (AWindowFolderSubItems *)sublist->get(i);
+			if( item->matches(text) ) break;
+		}
+	}
+	return i >= 0 ? 1 : 0;
+}
+
+
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, Indexable *indexable)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -314,7 +356,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, EDL *edl)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -326,9 +368,9 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, int folder, int persist)
- : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]),
+ : AWindowFolderItem(_(AWindowGUI::folder_names[folder]),
 	folder>=0 && folder<AWINDOW_FOLDERS ?
-		gui->folder_icons[folder]: gui->folder_icon)
+		gui->folder_icons[folder] : gui->folder_icon)
 {
 	reset();
 	foldernum = folder;
@@ -339,7 +381,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, int folder, const char *title)
- : BC_ListBoxItem(title, gui->folder_icon)
+ : AWindowFolderItem(title, gui->folder_icon)
 {
 	reset();
 	foldernum = folder;
@@ -350,7 +392,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, PluginServer *plugin)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -360,7 +402,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, Label *label)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -436,6 +478,8 @@ void AssetPicon::reset()
 	label = 0;
 	indexable = 0;
 	edl = 0;
+	parent = 0;
+	sub_items = 0;
 	foldernum = AW_NO_FOLDER;
 	sort_key = -1;
 	icon = 0;
@@ -1076,6 +1120,7 @@ void AWindowGUI::create_objects()
 	add_subwindow(folder_list = new AWindowFolders(mwindow,
 		this, fx, fy, fw, fh));
 	update_effects();
+	folder_list->load_expanders();
 
 	//int x = mwindow->theme->abuttons_x;
 	//int y = mwindow->theme->abuttons_y;
@@ -1699,8 +1744,12 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable)
 	proxy_edl->session->audio_tracks = unproxy_asset->channels;
 	proxy_edl->create_default_tracks();
 	double length = proxy_asset->frame_rate > 0 ?
-		(double)proxy_asset->video_length / proxy_asset->frame_rate :
-		1.0 / mwindow->edl->session->frame_rate;
+		( proxy_asset->video_length >= 0 ?
+			( proxy_asset->video_length / proxy_asset->frame_rate ) :
+			( proxy_edl->session->si_useduration ?
+				proxy_edl->session->si_duration :
+				1.0 / proxy_asset->frame_rate ) ) :
+		1.0 / proxy_edl->session->frame_rate;
 	Track *current = proxy_edl->tracks->first;
 	for( int vtrack=0; current; current=NEXT ) {
 		if( current->data_type != TRACK_VIDEO ) continue;
@@ -1747,6 +1796,17 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 // Remove current pointers
 	dst[0].remove_all();
 	dst[1].remove_all_objects();
+	AWindowFolderSubItems *sub_items = 0;
+	if( folder >= 0 && folder < AW_LABEL_FOLDER ) {
+		AssetPicon *picon = 0;
+		for( int k=folders.size(); --k>=0; ) {
+			picon = (AssetPicon*)folders[k];
+			if( picon->foldernum == folder ) break;
+		}
+		if( picon )
+			sub_items = picon->sub_items;
+		folder = AW_NO_FOLDER;
+	}
 	BinFolder *bin_folder = folder < AWINDOW_USER_FOLDERS ? 0 :
 		mwindow->edl->get_folder(folder);
 
@@ -1769,6 +1829,10 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 			visible = 1;
 		if( !visible && picon->edl && picon->edl->local_session->folder == folder )
 			visible = 1;
+		if( visible && sub_items ) {
+			if( !sub_items->matches(picon->get_text()) )
+				visible = 0;
+		}
 		if( visible ) {
 			const char *text = search_text->get_text();
 			if( text && text[0] )
@@ -1838,19 +1902,20 @@ void AWindowGUI::filter_displayed_assets()
 	//allow_iconlisting = 1;
 	asset_titles[0] = C_("Title");
 	asset_titles[1] = _("Comments");
+	int folder = mwindow->edl->session->awindow_folder;
 
-	switch( mwindow->edl->session->awindow_folder ) {
+	switch( folder ) {
 	case AW_AEFFECT_FOLDER:
-		copy_picons(displayed_assets, &aeffects, AW_NO_FOLDER);
+		copy_picons(displayed_assets, &aeffects, folder);
 		break;
 	case AW_VEFFECT_FOLDER:
-		copy_picons(displayed_assets, &veffects, AW_NO_FOLDER);
+		copy_picons(displayed_assets, &veffects, folder);
 		break;
 	case AW_ATRANSITION_FOLDER:
-		copy_picons(displayed_assets, &atransitions, AW_NO_FOLDER);
+		copy_picons(displayed_assets, &atransitions, folder);
 		break;
 	case AW_VTRANSITION_FOLDER:
-		copy_picons(displayed_assets, &vtransitions, AW_NO_FOLDER);
+		copy_picons(displayed_assets, &vtransitions, folder);
 		break;
 	case AW_LABEL_FOLDER:
 		copy_picons(displayed_assets, &labellist, AW_NO_FOLDER);
@@ -2031,6 +2096,8 @@ AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y,
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_drag_scroll(0);
+	last_item0 = 0;
+	last_item1 = 0;
 }
 
 AWindowFolders::~AWindowFolders()
@@ -2039,8 +2106,21 @@ AWindowFolders::~AWindowFolders()
 
 int AWindowFolders::selection_changed()
 {
-	AssetPicon *picon = (AssetPicon*)get_selection(0, 0);
-	if( picon ) {
+	AWindowFolderItem *item0 = (AWindowFolderItem*)get_selection(0, 0);
+	AWindowFolderItem *item1 = (AWindowFolderItem*)get_selection(0, 1);
+// prefer expanded entry
+	AWindowFolderItem *item = item1 ? item1 : item0;
+	if( item0 && item1 && last_item0 == item0 && last_item1 == item1 ) {
+		item1->set_selected(0);
+		item1 = 0;
+		item = item0;
+	}
+	last_item0 = item0;
+	last_item1 = item1;
+	if( item ) {
+		AssetPicon *picon = item->get_picon();
+		picon->sub_items = (AWindowFolderSubItems*)(!item->parent ? 0 : item);
+
 		gui->stop_vicon_drawing();
 
 		if( get_button_down() && get_buttonpress() == 3 ) {
@@ -2097,6 +2177,72 @@ int AWindowFolders::drag_stop()
 	return result;
 }
 
+AWindowFolderSubItems::AWindowFolderSubItems(AWindowFolderItem *parent, const char *text)
+ : AWindowFolderItem(text)
+{
+	this->parent = parent;
+}
+
+int AWindowFolders::load_expanders()
+{
+	char expanders_path[BCTEXTLEN];
+	mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE);
+	FILE *fp = fopen(expanders_path, "r");
+	if( !fp ) {
+		snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
+			File::get_cindat_path(), EXPANDERS_FILE);
+		fp = fopen(expanders_path, "r");
+	}
+
+	if( !fp ) return 1;
+	const char tab = '\t';
+	char line[BCTEXTLEN];   line[0] = 0;
+	AWindowFolderItem *item = 0, *parent;
+	AWindowFolderSubItems *sub_items = 0;
+	int k = 0;
+	while( fgets(line,sizeof(line),fp) ) {
+		if( line[0] == '#' ) continue;
+		int i = strlen(line);
+		if( i > 0 && line[i-1] == '\n' ) line[--i] = 0;
+		if( i == 0 ) continue;
+		i = 0;
+		for( char *cp=line; *cp==tab; ++cp ) ++i;
+		if( i == 0 ) {
+			int i = gui->folders.size();
+			while( --i >= 0 ) {
+				AssetPicon *folder = (AssetPicon *)gui->folders[i];
+				if( !strcmp(folder->get_text(),_(line)) ) break;
+			}
+			item = (AWindowFolderItem*)(i >= 0 ? gui->folders[i] : 0);
+			sub_items = 0;
+			k = 0;
+			continue;
+		}
+		if( i > k+1 ) continue;
+		if( i == k+1 ) {
+			if( line[i] != '-' && sub_items ) {
+				sub_items->names.append(cstrdup(_(&line[i])));
+				continue;
+			}
+			parent = item;
+			k = i;
+		}
+		else {
+			while( i < k ) {
+				item = item->parent;
+				--k;
+			}
+			parent = item->parent;
+		}
+		ArrayList<BC_ListBoxItem*> *sublist = parent->get_sublist();
+		if( !sublist ) sublist = parent->new_sublist(1);
+		sub_items = new AWindowFolderSubItems(parent, &line[i]);
+		sublist->append(item = sub_items);
+	}
+	fclose(fp);
+	return 0;
+}
+
 
 AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h)
  : BC_ListBox(x, y, w, h, !gui->allow_iconlisting ? LISTBOX_TEXT :