X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbinfolder.C;h=ffe5a12f9484548a3a2aabcfab901e3236f0dde9;hp=9082f42c267028b5461eb5338456d27a536b4847;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=1f004d22ca7bd7a98a3bf02b12ec5b1adece92f2 diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C index 9082f42c..ffe5a12f 100644 --- a/cinelerra-5.1/cinelerra/binfolder.C +++ b/cinelerra-5.1/cinelerra/binfolder.C @@ -338,7 +338,7 @@ int BinFolder::load_xml(FileXML *file) return ret; } -int BinFolder::add_patterns(ArrayList *drag_idxbls) +int BinFolder::add_patterns(ArrayList *drag_idxbls, int use_basename) { int n = drag_idxbls->size(); if( !n ) return 1; @@ -349,7 +349,14 @@ int BinFolder::add_patterns(ArrayList *drag_idxbls) if( !idxbl->is_asset && idxbl->awindow_folder == AW_PROXY_FOLDER ) continue; - len += strlen(idxbl->get_title()) + 1; + + const char *tp = idxbl->get_title(); + if( use_basename && idxbl->is_asset ) { + const char *cp = strrchr(tp, '/'); + if( cp ) tp = cp + 1; + len += 2; // "*/" + fn + } + len += strlen(tp) + 1; } if( !len ) return 1; char *pats = new char[len+1], *bp = pats; @@ -359,8 +366,13 @@ int BinFolder::add_patterns(ArrayList *drag_idxbls) idxbl->awindow_folder == AW_PROXY_FOLDER ) continue; if( i > 0 ) *bp++ = '\n'; - const char *cp = idxbl->get_title(); - while( *cp ) *bp++ = *cp++; + const char *tp = idxbl->get_title(); + if( use_basename && idxbl->is_asset ) { + const char *cp = strrchr(tp, '/'); + if( cp ) tp = cp + 1; + *bp++ = '*'; *bp++ = '/'; + } + while( *tp ) *bp++ = *tp++; } *bp = 0; // new pattern filter