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 1fff3eff0b842e47636ccea3fa9208cce00d5d91..30553a79e92177fbfba0ade776b5a34e28e3e356 100644
(file)
--- 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 "edl.h"
#include "indexable.h"
#include "language.h"
+#include "localsession.h"
#include <string.h>
#include <string.h>
@@
-30,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;
}
}
@@
-64,7
+65,7
@@
void Indexable::update_index(Indexable *src)
if( index_state == src->index_state ) return;
if( index_state ) index_state->remove_user();
index_state = src->index_state;
if( index_state == src->index_state ) return;
if( index_state ) index_state->remove_user();
index_state = src->index_state;
- index_state->add_user();
+ i
f( index_state ) i
ndex_state->add_user();
}
}
@@
-73,6
+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;
+ folder_no = src->folder_no;
update_path(src->path);
update_index(src);
}
update_path(src->path);
update_index(src);
}
@@
-112,8
+114,11
@@
int64_t Indexable::get_video_frames()
return 0;
}
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;
+}