ffmpeg audio tracking alignment, bluebanana fixes, bg render hotkey, ogg format

[goodguy/history.git] / cinelerra-5.1 / plugins / bluebanana / bluebananaconfig.C

diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
index a4e48217ee5d012f456aaf94b6a4a466dd829880..330af41cabf78b80e109536b7496e84ddc75903a 100644 (file)
--- a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
+++ b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
@@ -25,6 +25,7 @@
 #include <math.h>
 
 BluebananaConfig::BluebananaConfig() {
+  op = 0;
   mark = 0;
   active = 1;
   use_mask = 0;
@@ -83,12 +84,15 @@ BluebananaConfig::BluebananaConfig() {
 
   Oadj_active=0;
   Oadj_val=100;
+  Aadj_active=0;
+  Aadj_val=100;
 
 }
 
 int BluebananaConfig::equivalent(BluebananaConfig &that) {
   if(active != that.active) return 0;
   // mark is no an auto
+  if(op != that.op) return 0;
   if(use_mask != that.use_mask) return 0;
   if(capture_mask != that.capture_mask) return 0;
   if(invert_selection != that.invert_selection) return 0;
@@ -120,6 +124,8 @@ int BluebananaConfig::equivalent(BluebananaConfig &that) {
 
   if(Oadj_active != that.Oadj_active) return 0;
   if(Oadj_val != that.Oadj_val) return 0;
+  if(Aadj_active != that.Aadj_active) return 0;
+  if(Aadj_val != that.Aadj_val) return 0;
 
   if(Sadj_active != that.Sadj_active) return 0;
   if(Sadj_gamma != that.Sadj_gamma) return 0;
@@ -151,6 +157,7 @@ int BluebananaConfig::equivalent(BluebananaConfig &that) {
 
 void BluebananaConfig::copy_from(BluebananaConfig &that) {
   mark = that.mark;
+  op = that.op;
   active = that.active;
   use_mask = that.use_mask;
   capture_mask = that.capture_mask;
@@ -205,6 +212,8 @@ void BluebananaConfig::copy_from(BluebananaConfig &that) {
 
   Oadj_active = that.Oadj_active;
   Oadj_val = that.Oadj_val;
+  Aadj_active = that.Aadj_active;
+  Aadj_val = that.Aadj_val;
 }
 
 void BluebananaConfig::interpolate(BluebananaConfig &prev,
@@ -216,6 +225,7 @@ void BluebananaConfig::interpolate(BluebananaConfig &prev,
   double next_scale = (double)(current_frame - prev_frame) / (next_frame - prev_frame);
   double prev_scale = 1.0 - next_scale;
 
+  op = prev.op;
   active = prev.active;
   use_mask = prev.use_mask;
   capture_mask = prev.capture_mask;
@@ -253,6 +263,7 @@ void BluebananaConfig::interpolate(BluebananaConfig &prev,
 
   Hadj_val = ( prev.Hadj_val*prev_scale + next.Hadj_val*next_scale);
   Oadj_val = ( prev.Oadj_val*prev_scale + next.Oadj_val*next_scale);
+  Aadj_val = ( prev.Aadj_val*prev_scale + next.Aadj_val*next_scale);
 
   Sadj_gamma = ( prev.Sadj_gamma*prev_scale + next.Sadj_gamma*next_scale);
   Sadj_lo = ( prev.Sadj_lo*prev_scale + next.Sadj_lo*next_scale);