X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Findexable.C;h=30553a79e92177fbfba0ade776b5a34e28e3e356;hb=0d3917a4eda0344055badf0bd6e235c15c3b6cb8;hp=293d321ed567a6b971b3a1cb74df0433824b8dd5;hpb=09ccfde5a1fd65069f69b37490462b7ccf38a336;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/indexable.C b/cinelerra-5.1/cinelerra/indexable.C index 293d321e..30553a79 100644 --- a/cinelerra-5.1/cinelerra/indexable.C +++ b/cinelerra-5.1/cinelerra/indexable.C @@ -23,6 +23,7 @@ #include "edl.h" #include "indexable.h" #include "language.h" +#include "localsession.h" #include @@ -30,7 +31,7 @@ Indexable::Indexable(int is_asset) : Garbage(is_asset ? "Asset" : "EDL") { index_state = new IndexState; this->is_asset = is_asset; - this->awindow_folder = AW_MEDIA_FOLDER; + this->folder_no = AW_MEDIA_FOLDER; } @@ -73,7 +74,7 @@ void Indexable::update_index(Indexable *src) void Indexable::copy_indexable(Indexable *src) { if( this == src ) return; - awindow_folder = src->awindow_folder; + folder_no = src->folder_no; update_path(src->path); update_index(src); } @@ -113,8 +114,11 @@ int64_t Indexable::get_video_frames() return 0; } - - - - +const char *Indexable::get_title() +{ + if( is_asset ) return path; + EDL *edl = (EDL*)this; + if( !edl->parent_edl || folder_no == AW_PROXY_FOLDER ) return path; + return edl->local_session->clip_title; +}