fix spelling, more clipboard fixes

diff --git a/cinelerra-5.1/cinelerra/amodule.C b/cinelerra-5.1/cinelerra/amodule.C
index 7fc0140bc8735f57b03f7fa0d79cdb1066a27026..6ade03dd05fd8edb49232ae7327ce8157a4bfc9d 100644 (file)
--- a/cinelerra-5.1/cinelerra/amodule.C
+++ b/cinelerra-5.1/cinelerra/amodule.C
@@ -282,7 +282,7 @@ speed_fragment_len);
                FloatAuto *previous = 0;
                FloatAuto *next = 0;
                FloatAutos *speed_autos = (FloatAutos*)track->automation->autos[AUTOMATION_SPEED];
-               speed_position += speed_autos->automation_intergal(edit_startproject,
+               speed_position += speed_autos->automation_integral(edit_startproject,
                                start_project-edit_startproject, PLAY_FORWARD);
                speed_position1 = speed_position;
 

diff --git a/cinelerra-5.1/cinelerra/floatautos.C b/cinelerra-5.1/cinelerra/floatautos.C
index 458016cf98fd185e72ac216c0894114e8793cb8f..fde4a155eca44c0e571658541c714d295796bd58 100644 (file)
--- a/cinelerra-5.1/cinelerra/floatautos.C
+++ b/cinelerra-5.1/cinelerra/floatautos.C
@@ -425,7 +425,7 @@ void FloatAutos::dump()
        }
 }
 
-double FloatAutos::automation_intergal(int64_t start, int64_t length, int direction)
+double FloatAutos::automation_integral(int64_t start, int64_t length, int direction)
 {
        if( direction == PLAY_REVERSE )
                start -= length;

diff --git a/cinelerra-5.1/cinelerra/floatautos.h b/cinelerra-5.1/cinelerra/floatautos.h
index 8c8e7359bdb21db8ce53f50d69dae466c2991325..d83f150936890da5349b3d7839f3d30b2c94d78d 100644 (file)
--- a/cinelerra-5.1/cinelerra/floatautos.h
+++ b/cinelerra-5.1/cinelerra/floatautos.h
@@ -63,7 +63,7 @@ public:
                int64_t unit_end);
 
        void set_automation_mode(int64_t start, int64_t end, int mode);
-       double automation_intergal(int64_t start, int64_t length, int direction);
+       double automation_integral(int64_t start, int64_t length, int direction);
 
        void dump();
        Auto* new_auto();

diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C
index d345cbc47b7302db44c306c8946f5bbfe28579c8..02e047e64163f3fa115b094c204193db9e881055 100644 (file)
--- a/cinelerra-5.1/cinelerra/vmodule.C
+++ b/cinelerra-5.1/cinelerra/vmodule.C
@@ -267,7 +267,7 @@ int VModule::import_frame(VFrame *output, VEdit *current_edit,
 // integrate position from start of edit.
                                double speed_position = edit_startsource;
                                FloatAutos *speed_autos = (FloatAutos*)track->automation->autos[AUTOMATION_SPEED];
-                               speed_position += speed_autos->automation_intergal(edit_startproject,
+                               speed_position += speed_autos->automation_integral(edit_startproject,
                                                direction_position-edit_startproject, PLAY_FORWARD);
 //printf("VModule::import_frame %d %lld %lld\n", __LINE__, position, (int64_t)speed_position);
                                position = (int64_t)speed_position;

diff --git a/cinelerra-5.1/guicast/bcclipboard.C b/cinelerra-5.1/guicast/bcclipboard.C
index bae148fc1b1ec8737f40b966ab58bfcfee8e43f1..aa3b2f0800fd6f432bfc1b4ee073c67a0658e5ce 100644 (file)
--- a/cinelerra-5.1/guicast/bcclipboard.C
+++ b/cinelerra-5.1/guicast/bcclipboard.C
@@ -255,13 +255,12 @@ int BC_Clipboard::to_clipboard(BC_WindowBase *owner, const char *data, long len,
 
        if( clipboard_num < CLIP_BUFFER0 ) {
                char *bfr = data_buffer[clipboard_num];
-               if( data_length[clipboard_num] != len+1 ) {
-                       delete [] bfr;  bfr = new char[len+1];
+               if( data_length[clipboard_num] != len ) {
+                       delete [] bfr;  bfr = new char[len];
                        data_buffer[clipboard_num] = bfr;
-                       data_length[clipboard_num] = len+1;
+                       data_length[clipboard_num] = len;
                }
                memcpy(bfr, data, len);
-               bfr[len] = 0;
                Atom selection = clipboard_num == CLIP_PRIMARY ? xa_primary : clipboard;
 // this is not supposed to be necessary according to the man page
                Window cur = XGetSelectionOwner(out_display, selection);