projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clip folder bug on reload, expander user folder drag/drop segv, remove libfdk src...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
indexable.C
diff --git
a/cinelerra-5.1/cinelerra/indexable.C
b/cinelerra-5.1/cinelerra/indexable.C
index 2d32e1943fc84e45f9d0969b50fed0b6318c5e26..30553a79e92177fbfba0ade776b5a34e28e3e356 100644
(file)
--- a/
cinelerra-5.1/cinelerra/indexable.C
+++ b/
cinelerra-5.1/cinelerra/indexable.C
@@
-31,7
+31,7
@@
Indexable::Indexable(int is_asset) : Garbage(is_asset ? "Asset" : "EDL")
{
index_state = new IndexState;
this->is_asset = is_asset;
{
index_state = new IndexState;
this->is_asset = is_asset;
- this->
awindow_folder
= AW_MEDIA_FOLDER;
+ this->
folder_no
= AW_MEDIA_FOLDER;
}
}
@@
-74,7
+74,7
@@
void Indexable::update_index(Indexable *src)
void Indexable::copy_indexable(Indexable *src)
{
if( this == src ) return;
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);
}
update_path(src->path);
update_index(src);
}
@@
-118,7
+118,7
@@
const char *Indexable::get_title()
{
if( is_asset ) return path;
EDL *edl = (EDL*)this;
{
if( is_asset ) return path;
EDL *edl = (EDL*)this;
- if( !edl->parent_edl ||
awindow_folder
== AW_PROXY_FOLDER ) return path;
+ if( !edl->parent_edl ||
folder_no
== AW_PROXY_FOLDER ) return path;
return edl->local_session->clip_title;
}
return edl->local_session->clip_title;
}