X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassets.C;h=7585966e9d876e0863ab350485fa87f30983047e;hb=7b25542808937e46959c104a706b75f04b1215be;hp=7411b59ad15745525580f1f0e04dc828cba85b90;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/assets.C b/cinelerra-5.1/cinelerra/assets.C index 7411b59a..7585966e 100644 --- a/cinelerra-5.1/cinelerra/assets.C +++ b/cinelerra-5.1/cinelerra/assets.C @@ -65,8 +65,7 @@ int Assets::load(FileXML *file, uint32_t load_flags) { Asset *new_asset = new Asset(path); new_asset->read(file); - Asset *asset = update(new_asset); - asset->copy_from(new_asset,1); + update(new_asset); new_asset->Garbage::remove_user(); } } @@ -107,14 +106,6 @@ void Assets::copy_from(Assets *assets) } } -Assets& Assets::operator=(Assets &assets) -{ -printf("Assets::operator= 1\n"); - copy_from(&assets); - return *this; -} - - void Assets::update_index(Asset *asset) { if(!asset) return;