X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplugin.C;fp=cinelerra-5.1%2Fcinelerra%2Fplugin.C;h=b4c8e4431c216913772eca95c41c3032ea5f329f;hb=0c086b3e7b552e0f6b06c8696d7682d9d4bd91db;hp=25023190bab85b6eb8dfcbb6e08a7189cc60e6a0;hpb=0a6f0e773e20a4a8ada053c47ee9d93b1bd06e81;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/plugin.C b/cinelerra-5.1/cinelerra/plugin.C index 25023190..b4c8e443 100644 --- a/cinelerra-5.1/cinelerra/plugin.C +++ b/cinelerra-5.1/cinelerra/plugin.C @@ -100,10 +100,7 @@ int Plugin::operator==(Edit& that) int Plugin::silence() { - if(plugin_type != PLUGIN_NONE) - return 0; - else - return 1; + return plugin_type == PLUGIN_NONE ? 1 : 0; } void Plugin::clear_keyframes(int64_t start, int64_t end) @@ -112,7 +109,7 @@ void Plugin::clear_keyframes(int64_t start, int64_t end) } -void Plugin::copy_from(Edit *edit) +void Plugin::copy_base(Edit *edit) { Plugin *plugin = (Plugin*)edit; @@ -129,8 +126,12 @@ void Plugin::copy_from(Edit *edit) // Should reconfigure this based on where the first track is now. this->shared_location = plugin->shared_location; strcpy(this->title, plugin->title); +} - copy_keyframes(plugin); +void Plugin::copy_from(Edit *edit) +{ + copy_base(edit); + copy_keyframes((Plugin*)edit); } void Plugin::copy_keyframes(Plugin *plugin)