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
/
asset.C
diff --git
a/cinelerra-5.1/cinelerra/asset.C
b/cinelerra-5.1/cinelerra/asset.C
index ec82d0e9e6ead12eb2d7e245f161a5579303b35b..4f911e984d544803057547946beb7b9de4ddd55e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/asset.C
+++ b/
cinelerra-5.1/cinelerra/asset.C
@@
-190,7
+190,7
@@
void Asset::copy_from(Asset *asset, int do_index)
void Asset::copy_location(Asset *asset)
{
strcpy(path, asset->path);
void Asset::copy_location(Asset *asset)
{
strcpy(path, asset->path);
-
awindow_folder = asset->awindow_folder
;
+
folder_no = asset->folder_no
;
}
void Asset::copy_format(Asset *asset, int do_index)
}
void Asset::copy_format(Asset *asset, int do_index)
@@
-459,7
+459,7
@@
int Asset::read(FileXML *file,
else
if(file->tag.title_is("FOLDER"))
{
else
if(file->tag.title_is("FOLDER"))
{
-
awindow_folder
= file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
+
folder_no
= file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
}
else
if(file->tag.title_is("VIDEO"))
}
else
if(file->tag.title_is("VIDEO"))
@@
-577,7
+577,7
@@
int Asset::write(FileXML *file,
file->append_newline();
file->tag.set_title("FOLDER");
file->append_newline();
file->tag.set_title("FOLDER");
- file->tag.set_property("NUMBER",
awindow_folder
);
+ file->tag.set_property("NUMBER",
folder_no
);
file->append_tag();
file->tag.set_title("/FOLDER");
file->append_tag();
file->append_tag();
file->tag.set_title("/FOLDER");
file->append_tag();