undo fixes, viewer change_source rework, cleanup

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 1afb19e4580940c2b98b1d20a19755f19b3d1fc7..238a73c694addb15f8685ecf71a89ef4971ba8ce 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -241,7 +241,6 @@ AssetPopupView::~AssetPopupView()
 int AssetPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
 int AssetPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);

-       vwindow->gui->lock_window("AssetPopupView::handle_event");

 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(


@@ -251,7 +250,6 @@ int AssetPopupView::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 

-       vwindow->gui->unlock_window();

        return 1;
 }
 
        return 1;
 }
 


@@ -273,8 +271,6 @@ int AssetPopupViewWindow::handle_event()
        VWindow *vwindow = mwindow->get_viewer(1);
 
 // TODO: create new vwindow or change current vwindow
        VWindow *vwindow = mwindow->get_viewer(1);
 
 // TODO: create new vwindow or change current vwindow

-       vwindow->gui->lock_window("AssetPopupView::handle_event");
-

        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
                        mwindow->session->drag_assets->values[0]);
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
                        mwindow->session->drag_assets->values[0]);


@@ -283,7 +279,6 @@ int AssetPopupViewWindow::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 

-       vwindow->gui->unlock_window();

        return 1;
 }
 
        return 1;
 }
 

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 9769b99847f940811adaeacc8c5a47c32fd8901e..6c640328cede9d75f341acc32df6b8dc1f0b87a1 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -1673,12 +1673,10 @@ int AWindowAssets::handle_event()
                mwindow->vwindows.get(DEFAULT_VWINDOW) : 0;
        if( !vwindow || !vwindow->is_running() ) return 1;
 
                mwindow->vwindows.get(DEFAULT_VWINDOW) : 0;
        if( !vwindow || !vwindow->is_running() ) return 1;
 

-       vwindow->gui->lock_window("AWindowAssets::handle_event");

        if( asset_picon->indexable )
                vwindow->change_source(asset_picon->indexable);
        else if( asset_picon->edl )
                vwindow->change_source(asset_picon->edl);
        if( asset_picon->indexable )
                vwindow->change_source(asset_picon->indexable);
        else if( asset_picon->edl )
                vwindow->change_source(asset_picon->edl);

-       vwindow->gui->unlock_window();

        return 1;
 }
 
        return 1;
 }
 

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index f6ca8231e148626888397746caa3317cd7192195..07ae7252fedd46e4749f085cb09b10aaceddfadc 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -186,7 +186,6 @@ ClipPopupView::~ClipPopupView()
 int ClipPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
 int ClipPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);

-       vwindow->gui->lock_window("ClipPopupView::handle_event");

 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(


@@ -196,7 +195,6 @@ int ClipPopupView::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 

-       vwindow->gui->unlock_window();

        return 1;
 }
 
        return 1;
 }
 

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index bd048c10de5fa84fcc816206386b8079b753192c..a0aec63baf641caeef00ca699c33b61757faa89c 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -190,11 +190,13 @@ int MainUndo::redo_load_flags()
 int MainUndo::undo()
 {
        mwindow->undo_commercial();
 int MainUndo::undo()
 {
        mwindow->undo_commercial();

-
-       UndoStackItem *current = next_undo();
-// Now have an even number
+       UndoStackItem *current = undo_stack->current;
+       if( current ) {
+               undo_stack->current = next_undo();
+               if( undo_stack->number_of(current) % 2 )
+                       current = PREVIOUS; // Now have an even number
+       }

        if( current ) {
        if( current ) {

-               undo_stack->current = current;

 // Set the redo text to the current description
                if( mwindow->gui ) {
                        UndoStackItem *next = NEXT;
 // Set the redo text to the current description
                if( mwindow->gui ) {
                        UndoStackItem *next = NEXT;

diff --git a/cinelerra-5.1/cinelerra/undostack.C b/cinelerra-5.1/cinelerra/undostack.C
index 1bb781022695ec1ba5059c834c236902924a7696..fdf2c5c7a6e2ae78b3070e8c090b0bf1b66e665f 100644 (file)
--- a/cinelerra-5.1/cinelerra/undostack.C
+++ b/cinelerra-5.1/cinelerra/undostack.C
@@ -38,16 +38,16 @@ UndoStack::~UndoStack()
 UndoStackItem *UndoStack::get_current_undo()
 {
        UndoStackItem *item = current;
 UndoStackItem *UndoStack::get_current_undo()
 {
        UndoStackItem *item = current;

-       if( item &&  (number_of(item) % 2) ) item = item->previous;
-       if( item && !(number_of(item) % 2) ) item = item->previous;
+       if( item &&  (number_of(item) & 1) ) item = item->previous;
+       if( item && !(number_of(item) & 1) ) item = item->previous;

        return item;
 }
 
 UndoStackItem *UndoStack::get_current_redo()
 {
        UndoStackItem *item = current ? current : first;
        return item;
 }
 
 UndoStackItem *UndoStack::get_current_redo()
 {
        UndoStackItem *item = current ? current : first;

-       if( item &&  (number_of(item) % 2) ) item = item->next;
-       if( item && !(number_of(item) % 2) ) item = item->next;
+       if( item &&  (number_of(item) & 1) ) item = item->next;
+       if( item && !(number_of(item) & 1) ) item = item->next;

        return item;
 }
 
        return item;
 }
 


@@ -55,35 +55,30 @@ UndoStackItem *UndoStack::get_current_redo()
 UndoStackItem* UndoStack::push()
 {
 // current is only 0 if before first undo
 UndoStackItem* UndoStack::push()
 {
 // current is only 0 if before first undo

-       if(current)
+       if( current )

                current = insert_after(current);
        else
                current = insert_before(first);
 
 // delete future undos if necessary
                current = insert_after(current);
        else
                current = insert_before(first);
 
 // delete future undos if necessary

-       if(current && current->next)
-       {
-               while(current->next) remove(last);
+       if( current && current->next ) {
+               while( current->next ) remove(last);

        }
 
 // delete oldest 2 undos if necessary
        }
 
 // delete oldest 2 undos if necessary

-       if(total() > UNDOLEVELS)
-       {
-               for(int i = 0; i < 2; i++)
-               {
+       if( total() > UNDOLEVELS ) {
+               for( int i=0; i<2; ++i ) {

                        UndoStackItem *second = first->next;
                        char *temp_data = 0;
 
 
                        UndoStackItem *second = first->next;
                        char *temp_data = 0;
 
 

-                       if(!second->is_key())
-                       {
+                       if( !second->is_key() ) {

                                temp_data = second->get_data();
                        }
                        remove(first);
 
 // Convert new first to key buffer.
                                temp_data = second->get_data();
                        }
                        remove(first);
 
 // Convert new first to key buffer.

-                       if(!second->is_key())
-                       {
+                       if( !second->is_key() ) {

                                second->set_data(temp_data);
                        }
                        delete [] temp_data;
                                second->set_data(temp_data);
                        }
                        delete [] temp_data;


@@ -96,11 +91,11 @@ UndoStackItem* UndoStack::push()
 UndoStackItem* UndoStack::pull_next()
 {
 // use first entry if none
 UndoStackItem* UndoStack::pull_next()
 {
 // use first entry if none

-       if(!current)
+       if( !current )

                current = first;
        else
 // use next entry if there is a next entry
                current = first;
        else
 // use next entry if there is a next entry

-       if(current->next)
+       if( current->next )

                current = NEXT;
 // don't change current if there is no next entry
        else
                current = NEXT;
 // don't change current if there is no next entry
        else


@@ -114,45 +109,21 @@ void UndoStack::dump(FILE *fp)
 {
        fprintf(fp,"UndoStack::dump\n");
        UndoStackItem *current = last;
 {
        fprintf(fp,"UndoStack::dump\n");
        UndoStackItem *current = last;

-       int i = 0;

 // Dump most recent
 // Dump most recent

-       while(current && i < 10)
-       {
-               fprintf(fp,"  %d %p %s %c\n",
-                       i++,
-                       current,
-                       current->get_description(),
-                       current == this->current ? '*' : ' ');
-               current = PREVIOUS;
+       for( int i=0; current && i<16; ++i,current=PREVIOUS ) {
+               fprintf(fp,"  %d %p %s %04jx %c\n", i, current, current->get_description(),
+                       current->get_flags(), current == this->current ? '*' : ' ');
+//char fn[BCSTRLEN]; sprintf(fn,"/tmp/undo%d", i); FILE *fp = fopen(fn,"w");
+//if( fp ) { char *cp=current->get_data(); fwrite(cp,strlen(cp),1,fp); fclose(fp); delete [] cp; }

        }
 }
 
 
 
        }
 }
 
 
 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

 // These difference routines are straight out of the Heroinediff/Heroinepatch
 // utilities.
 
 
 // These difference routines are straight out of the Heroinediff/Heroinepatch
 // utilities.
 
 

-
-
-
-

 // We didn't want to use the diff program because that isn't efficient enough
 // to compress EDL's.  This program also handles binary data.
 
 // We didn't want to use the diff program because that isn't efficient enough
 // to compress EDL's.  This program also handles binary data.
 


@@ -175,12 +146,6 @@ void UndoStack::dump(FILE *fp)
 // for differences.
 
 
 // for differences.
 
 

-
-
-
-
-
-

 // Minimum size of transposed block.
 // Smaller transpositions should be included in the same difference record.
 #define MIN_TRANS 16
 // Minimum size of transposed block.
 // Smaller transpositions should be included in the same difference record.
 #define MIN_TRANS 16


@@ -197,8 +162,7 @@ static void append_record(unsigned char **result,
        int new_size,
        int old_size)
 {
        int new_size,
        int old_size)
 {

-       if(new_size || old_size)
-       {
+       if( new_size || old_size ) {

                int record_size = new_size + 12;
                unsigned char *new_result = new unsigned char[(*result_size) + record_size];
                memcpy(new_result, (*result), (*result_size));
                int record_size = new_size + 12;
                unsigned char *new_result = new unsigned char[(*result_size) + record_size];
                memcpy(new_result, (*result), (*result_size));


@@ -238,12 +202,10 @@ static unsigned char* get_difference_fast(unsigned char *before,
 // Get last different bytes
        unsigned char *last_difference_after = after + after_len - 1;
        unsigned char *last_difference_before = before + before_len - 1;
 // Get last different bytes
        unsigned char *last_difference_after = after + after_len - 1;
        unsigned char *last_difference_before = before + before_len - 1;

-       while(1)
-       {
-               if(last_difference_after < after ||
-                       last_difference_before < before) break;
-               if(*last_difference_after != *last_difference_before)
-               {
+       for(;;) {
+               if( last_difference_after < after ||
+                       last_difference_before < before ) break;
+               if( *last_difference_after != *last_difference_before ) {

                        break;
                }
                last_difference_after--;
                        break;
                }
                last_difference_after--;


@@ -252,11 +214,6 @@ static unsigned char* get_difference_fast(unsigned char *before,
        last_difference_after++;
        last_difference_before++;
 
        last_difference_after++;
        last_difference_before++;
 

-
-
-
-
-

        int done = 0;
        unsigned char *before_ptr = before;
        unsigned char *after_ptr = after;
        int done = 0;
        unsigned char *before_ptr = before;
        unsigned char *after_ptr = after;


@@ -264,72 +221,54 @@ static unsigned char* get_difference_fast(unsigned char *before,
        unsigned char *after_end = after + after_len;
 
 // Scan forward for first difference
        unsigned char *after_end = after + after_len;
 
 // Scan forward for first difference

-       while(!done)
-       {
-               if(before_ptr < before_end &&
-                       after_ptr < after_end)
-               {
+       while( !done ) {
+               if( before_ptr < before_end &&
+                       after_ptr < after_end ) {

 // Both characters equal
 // Both characters equal

-                       if(*before_ptr == *after_ptr &&
+                       if( *before_ptr == *after_ptr &&

                                before_ptr < last_difference_before &&
                                before_ptr < last_difference_before &&

-                               after_ptr < last_difference_after)
-                       {
+                               after_ptr < last_difference_after ) {

                                before_ptr++;
                                after_ptr++;
                        }
                                before_ptr++;
                                after_ptr++;
                        }

-                       else
+                       else {

 // Characters differ
 // Characters differ

-                       {

 // Get length of difference.
                                unsigned char *before_difference_start = before_ptr;
                                unsigned char *after_difference_start = after_ptr;
 
 
 // Get length of difference.
                                unsigned char *before_difference_start = before_ptr;
                                unsigned char *after_difference_start = after_ptr;
 
 

-                               while(*before_ptr != *after_ptr &&
-                                       before_ptr < last_difference_before &&
-                                       after_ptr < last_difference_after)
-                               {
+                               while( *before_ptr != *after_ptr &&
+                                   before_ptr < last_difference_before &&
+                                   after_ptr < last_difference_after ) {

                                        before_ptr++;
                                        after_ptr++;
                                }
 
 // Finished comparing if either pointer hits its last difference
                                        before_ptr++;
                                        after_ptr++;
                                }
 
 // Finished comparing if either pointer hits its last difference

-                               if(before_ptr >= last_difference_before ||
-                                       after_ptr >= last_difference_after)
-                               {
+                               if( before_ptr >= last_difference_before ||
+                                       after_ptr >= last_difference_after ) {

                                        done = 1;
                                        before_ptr = last_difference_before;
                                        after_ptr = last_difference_after;
                                }
 
                                        done = 1;
                                        before_ptr = last_difference_before;
                                        after_ptr = last_difference_after;
                                }
 

-
-

                                int after_start = after_difference_start - after;
                                int before_start = before_difference_start - before;
                                int after_len = after_ptr - after_difference_start;
                                int before_len = before_ptr - before_difference_start;
 
                                int after_start = after_difference_start - after;
                                int before_start = before_difference_start - before;
                                int after_len = after_ptr - after_difference_start;
                                int before_len = before_ptr - before_difference_start;
 

-                               if(verbose)
-                               {
+                               if( verbose ) {

                                        char string[1024];
                                        memcpy(string, after_difference_start, MIN(after_len, 40));
                                        string[MIN(after_len, 40)] = 0;
                                        printf("after_offset=0x%x before_offset=0x%x after_size=%d before_size=%d \"%s\"\n",
                                        char string[1024];
                                        memcpy(string, after_difference_start, MIN(after_len, 40));
                                        string[MIN(after_len, 40)] = 0;
                                        printf("after_offset=0x%x before_offset=0x%x after_size=%d before_size=%d \"%s\"\n",

-                                               after_start,
-                                               before_start,
-                                               after_len,
-                                               before_len,
-                                               string);
+                                               after_start, before_start, after_len, before_len, string);

                                }
 
                                }
 

-

 // Create difference record
 // Create difference record

-                               append_record(&result,
-                                       result_len,
-                                       after_difference_start,
-                                       after_start,
-                                       after_len,
-                                       before_len);
+                               append_record(&result, result_len, after_difference_start,
+                                       after_start, after_len, before_len);

                        }
                }
                else
                        }
                }
                else


@@ -338,45 +277,21 @@ static unsigned char* get_difference_fast(unsigned char *before,
        return result;
 }
 
        return result;
 }
 

-
-
-
-
-
-
-
-
-static void get_record(unsigned char **patch_ptr,
-       unsigned char *patch_end,
-       unsigned char **after_data,
-       int *after_offset,
-       int *after_size,
-       int *before_size)
+static void get_record(unsigned char **patch_ptr, unsigned char *patch_end,
+       unsigned char **after_data, int *after_offset, int *after_size, int *before_size)

 {
        (*after_data) = 0;
 {
        (*after_data) = 0;

-       if((*patch_ptr) < patch_end)
-       {
-               (*after_offset) = *(int32_t*)(*patch_ptr);
-               (*patch_ptr) += 4;
-               (*after_size) = *(int32_t*)(*patch_ptr);
-               (*patch_ptr) += 4;
-               (*before_size) = *(int32_t*)(*patch_ptr);
-               (*patch_ptr) += 4;
-
-               (*after_data) = (*patch_ptr);
-               (*patch_ptr) += (*after_size);
+       if( (*patch_ptr) < patch_end ) {
+               (*after_offset) = *(int32_t*)(*patch_ptr);  (*patch_ptr) += 4;
+               (*after_size) = *(int32_t*)(*patch_ptr);    (*patch_ptr) += 4;
+               (*before_size) = *(int32_t*)(*patch_ptr);   (*patch_ptr) += 4;
+               (*after_data) = (*patch_ptr);               (*patch_ptr) += (*after_size);

        }
 }
 
 
        }
 }
 
 

-
-
-
-static unsigned char* apply_difference(unsigned char *before,
-               int before_len,
-               unsigned char *patch,
-               int patch_len,
-               int *result_len)
+static unsigned char* apply_difference(unsigned char *before, int before_len,
+               unsigned char *patch, int patch_len, int *result_len)

 {
        unsigned char *patch_ptr = patch;
        *result_len = *(int32_t*)patch_ptr;
 {
        unsigned char *patch_ptr = patch;
        *result_len = *(int32_t*)patch_ptr;


@@ -390,25 +305,16 @@ static unsigned char* apply_difference(unsigned char *before,
        unsigned char *before_ptr = before;
 
        int done = 0;
        unsigned char *before_ptr = before;
 
        int done = 0;

-       while(!done)
-       {
+       while( !done ) {

                unsigned char *after_data;
                unsigned char *after_data;

-               int after_offset;
-               int after_size;
-               int before_size;
-
-               get_record(&patch_ptr,
-                       patch_end,
-                       &after_data,
-                       &after_offset,
-                       &after_size,
-                       &before_size);
-
-               if(after_data)
-               {
+               int after_offset, after_size, before_size;
+
+               get_record(&patch_ptr, patch_end,
+                       &after_data, &after_offset, &after_size, &before_size);
+
+               if( after_data ) {

                        int result_offset = result_ptr - result;
                        int result_offset = result_ptr - result;

-                       if(after_offset > result_offset)
-                       {
+                       if( after_offset > result_offset ) {

                                int skip_size = after_offset - result_offset;
                                memcpy(result_ptr, before_ptr, skip_size);
                                result_ptr += skip_size;
                                int skip_size = after_offset - result_offset;
                                memcpy(result_ptr, before_ptr, skip_size);
                                result_ptr += skip_size;


@@ -418,10 +324,9 @@ static unsigned char* apply_difference(unsigned char *before,
                        result_ptr += after_size;
                        before_ptr += before_size;
                }
                        result_ptr += after_size;
                        before_ptr += before_size;
                }

-               else
-               {
+               else {

 // All data from before_ptr to end of result buffer is identical
 // All data from before_ptr to end of result buffer is identical

-                       if(result_end - result_ptr > 0)
+                       if( result_end - result_ptr > 0 )

                                memcpy(result_ptr, before_ptr, result_end - result_ptr);
                        done = 1;
                }
                                memcpy(result_ptr, before_ptr, result_end - result_ptr);
                        done = 1;
                }


@@ -470,7 +375,7 @@ char* UndoStackItem::get_filename()
 
 const char* UndoStackItem::get_description()
 {
 
 const char* UndoStackItem::get_description()
 {

-       if(description)
+       if( description )

                return description;
        else
                return "";
                return description;
        else
                return "";


@@ -491,10 +396,8 @@ void UndoStackItem::set_data(char *data)
        int need_key = 1;
        UndoStackItem *current = this;
        this->key = 0;
        int need_key = 1;
        UndoStackItem *current = this;
        this->key = 0;

-       for(int i = 0; i < UNDO_KEY_INTERVAL && current; i++)
-       {
-               if(current->key && current->has_data())
-               {
+       for( int i=0; i<UNDO_KEY_INTERVAL && current; ++i ) {
+               if( current->key && current->has_data() ) {

                        need_key = 0;
                        break;
                }
                        need_key = 0;
                        break;
                }


@@ -504,8 +407,7 @@ void UndoStackItem::set_data(char *data)
 
        int new_size = strlen(data) + 1;
 
 
        int new_size = strlen(data) + 1;
 

-       if(!need_key)
-       {
+       if( !need_key ) {

 // Reconstruct previous data for difference
                char *prev_buffer = previous->get_data();
                int prev_size = prev_buffer ? strlen(prev_buffer) + 1 : 0;
 // Reconstruct previous data for difference
                char *prev_buffer = previous->get_data();
                int prev_size = prev_buffer ? strlen(prev_buffer) + 1 : 0;


@@ -536,14 +438,12 @@ void UndoStackItem::set_data(char *data)
 // Diff was bigger than original.
 // Happens if a lot of tiny changes happened and the record headers
 // took more space than the changes.
 // Diff was bigger than original.
 // Happens if a lot of tiny changes happened and the record headers
 // took more space than the changes.

-               if(this->data_size > new_size)
-               {
+               if( this->data_size > new_size ) {

                        delete [] this->data;
                        this->data_size = 0;
                        need_key = 1;
                }
                        delete [] this->data;
                        this->data_size = 0;
                        need_key = 1;
                }

-               else
-               {
+               else {

 // Reconstruct current data from difference
                        int test_size;
                        char *test_buffer = (char*)apply_difference((unsigned char*)prev_buffer,
 // Reconstruct current data from difference
                        int test_size;
                        char *test_buffer = (char*)apply_difference((unsigned char*)prev_buffer,


@@ -551,9 +451,8 @@ void UndoStackItem::set_data(char *data)
                                (unsigned char*)this->data,
                                this->data_size,
                                &test_size);
                                (unsigned char*)this->data,
                                this->data_size,
                                &test_size);

-                       if(test_size != new_size ||
-                               memcmp(test_buffer, data, test_size))
-                       {
+                       if( test_size != new_size ||
+                               memcmp(test_buffer, data, test_size) ) {

 // FILE *test1 = fopen("/tmp/undo1", "w");
 // fwrite(prev_buffer, prev_size, 1, test1);
 // fclose(test1);
 // FILE *test1 = fopen("/tmp/undo1", "w");
 // fwrite(prev_buffer, prev_size, 1, test1);
 // fclose(test1);


@@ -581,8 +480,7 @@ void UndoStackItem::set_data(char *data)
                delete [] prev_buffer;
        }
 
                delete [] prev_buffer;
        }
 

-       if(need_key)
-       {
+       if( need_key ) {

                this->key = 1;
                this->data_size = new_size;
                this->data = new char[this->data_size];
                this->key = 1;
                this->data_size = new_size;
                this->data = new char[this->data_size];


@@ -591,8 +489,6 @@ void UndoStackItem::set_data(char *data)
        return;
 }
 
        return;
 }
 

-
-

 char* UndoStackItem::get_incremental_data()
 {
        return data;
 char* UndoStackItem::get_incremental_data()
 {
        return data;


@@ -612,17 +508,15 @@ char* UndoStackItem::get_data()
 {
 // Find latest key buffer
        UndoStackItem *current = this;
 {
 // Find latest key buffer
        UndoStackItem *current = this;

-       while(current && !current->key)
+       while( current && !current->key )

                current = PREVIOUS;
                current = PREVIOUS;

-       if(!current)
-       {
+       if( !current ) {

                printf("UndoStackItem::get_data: no key buffer found!\n");
                return 0;
        }
 
 // This is the key buffer
                printf("UndoStackItem::get_data: no key buffer found!\n");
                return 0;
        }
 
 // This is the key buffer

-       if(current == this)
-       {
+       if( current == this ) {

                char *result = new char[data_size];
                memcpy(result, data, data_size);
                return result;
                char *result = new char[data_size];
                memcpy(result, data, data_size);
                return result;


@@ -632,21 +526,17 @@ char* UndoStackItem::get_data()
        char *current_data = current->get_data();
        int current_size = current->get_size();
        current = NEXT;
        char *current_data = current->get_data();
        int current_size = current->get_size();
        current = NEXT;

-       while(current)
-       {
+       while( current ) {

 // Do incremental updates
                int new_size;
 // Do incremental updates
                int new_size;

-               char *new_data = (char*)apply_difference((unsigned char*)current_data,
-                       current_size,
+               char *new_data = (char*)apply_difference((unsigned char*)current_data, current_size,

                        (unsigned char*)current->get_incremental_data(),
                        (unsigned char*)current->get_incremental_data(),

-                       current->get_incremental_size(),
-                       &new_size);
+                       current->get_incremental_size(), &new_size);

                delete [] current_data;
 
                delete [] current_data;
 

-               if(current == this)
+               if( current == this )

                        return new_data;
                        return new_data;

-               else
-               {
+               else {

                        current_data = new_data;
                        current_size = new_size;
                        current = NEXT;
                        current_data = new_data;
                        current_size = new_size;
                        current = NEXT;


@@ -659,9 +549,6 @@ char* UndoStackItem::get_data()
        return 0;
 }
 
        return 0;
 }
 

-
-
-

 int UndoStackItem::is_key()
 {
        return key;
 int UndoStackItem::is_key()
 {
        return key;


@@ -687,9 +574,3 @@ void* UndoStackItem::get_creator()
        return creator;
 }
 
        return creator;
 }
 

-
-
-
-
-
-

diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C
index 1bb3f0c355a29c8358630acdc719dc1939ef7991..206292f3cdc1e534c7f6ab7d1e74a65324d8f1f6 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindow.C
+++ b/cinelerra-5.1/cinelerra/vwindow.C
@@ -183,7 +183,10 @@ Indexable* VWindow::get_source()
 void VWindow::change_source(int edl_number)
 {
        if(!is_running()) return;
 void VWindow::change_source(int edl_number)
 {
        if(!is_running()) return;

+       if( playback_engine->is_playing_back )
+               stop_playback(1);

 
 

+       gui->lock_window("VWindow::change_source 1");

 //printf("VWindow::change_source %d %p\n", __LINE__, mwindow->edl->get_vwindow_edl(edl_number));
        if( edl_number >= 0 && edl_number < mwindow->edl->total_vwindow_edls() &&
                 mwindow->edl->get_vwindow_edl(edl_number) )
 //printf("VWindow::change_source %d %p\n", __LINE__, mwindow->edl->get_vwindow_edl(edl_number));
        if( edl_number >= 0 && edl_number < mwindow->edl->total_vwindow_edls() &&
                 mwindow->edl->get_vwindow_edl(edl_number) )


@@ -200,11 +203,16 @@ void VWindow::change_source(int edl_number)
 //             indexable = 0;
 //             mwindow->edl->vwindow_edl_shared = 0;
        }
 //             indexable = 0;
 //             mwindow->edl->vwindow_edl_shared = 0;
        }

+       gui->unlock_window();

 }
 
 void VWindow::change_source(Indexable *indexable)
 {
        if(!running()) return;
 }
 
 void VWindow::change_source(Indexable *indexable)
 {
        if(!running()) return;

+       if( playback_engine->is_playing_back )
+               stop_playback(1);
+
+       gui->lock_window("VWindow::change_source 2");

 //     if(asset && this->asset &&
 //             asset->id == this->asset->id &&
 //             asset == this->asset) return;
 //     if(asset && this->asset &&
 //             asset->id == this->asset->id &&
 //             asset == this->asset) return;


@@ -256,11 +264,16 @@ void VWindow::change_source(Indexable *indexable)
 
 
 //printf("VWindow::change_source 2\n");
 
 
 //printf("VWindow::change_source 2\n");

+       gui->unlock_window();

 }
 
 void VWindow::change_source(EDL *edl)
 {
        if(!running()) return;
 }
 
 void VWindow::change_source(EDL *edl)
 {
        if(!running()) return;

+       if( playback_engine->is_playing_back )
+               stop_playback(1);
+
+       gui->lock_window("VWindow::change_source 3");

 //printf("VWindow::change_source %d %p\n", __LINE__, edl);
 // EDLs are identical
 //     if(edl && mwindow->edl->vwindow_edl &&
 //printf("VWindow::change_source %d %p\n", __LINE__, edl);
 // EDLs are identical
 //     if(edl && mwindow->edl->vwindow_edl &&


@@ -286,6 +299,7 @@ void VWindow::change_source(EDL *edl)
        }
        else
                gui->change_source(edl, _("Viewer"));
        }
        else
                gui->change_source(edl, _("Viewer"));

+       gui->unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index ea05537bb7b2ec6e67bdfe08dfd21a685c13f100..5ff595eeaec5801f23c60b0bb5006cbb486f3489 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -424,6 +424,7 @@ int VWindowGUI::drag_stop()
        {
                highlighted = 0;
                canvas->draw_refresh();
        {
                highlighted = 0;
                canvas->draw_refresh();

+               unlock_window();

 
                Indexable *indexable = mwindow->session->drag_assets->size() ?
                        mwindow->session->drag_assets->get(0) :
 
                Indexable *indexable = mwindow->session->drag_assets->size() ?
                        mwindow->session->drag_assets->get(0) :


@@ -431,17 +432,12 @@ int VWindowGUI::drag_stop()
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;

-               if( vwindow->playback_engine->is_playing_back ) {
-                       unlock_window();
-                       vwindow->stop_playback(1);
-                       lock_window("VWindowGUI::drag_stop");
-               }
-

                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);
                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);

+               lock_window("VWindowGUI::drag_stop");

                return 1;
        }
 
                return 1;
        }
 

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index c1e036599456e2b005e18aadfa9deb633e87e68c..2d5f0d5815749baef936b89fccb3a3463d3e2f67 100644 (file)
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -82,7 +82,7 @@ OBJS = \
 OUTPUT = $(OBJDIR)/libguicast.a
 
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 OUTPUT = $(OBJDIR)/libguicast.a
 
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw

-BCXFER = xfer/$(OBJDIR)/xfer.o
+BCXFER = xfer/$(OBJDIR)/xfer.stamp

 
 CFLAGS += -I/usr/include/freetype2
 
 
 CFLAGS += -I/usr/include/freetype2
 

diff --git a/cinelerra-5.1/guicast/bccmdl.py b/cinelerra-5.1/guicast/bccmdl.py
index bae50c50a119b5c9245e702a89d7d5b833f1e030..0a54694113f102de6f56fc994c48eab59cac735b 100755 (executable)
--- a/cinelerra-5.1/guicast/bccmdl.py
+++ b/cinelerra-5.1/guicast/bccmdl.py
@@ -628,7 +628,7 @@ class_qual = "BC_Xfer::"
 xfn = "xfer/xfer.h"
 fd = open(xfn, "w")
 xid = "".join([chr(x) if chr(x).isalnum() else '_' for x in range(256)])
 xfn = "xfer/xfer.h"
 fd = open(xfn, "w")
 xid = "".join([chr(x) if chr(x).isalnum() else '_' for x in range(256)])

-xid = "__" + xfn.upper()[xfn.rfind("/")+1:].translate("".join(xid)) + "__"
+xid = "__" + xfn.upper()[xfn.rfind("/")+1:].translate(xid) + "__"

 print >>fd, "#ifndef %s" % xid
 print >>fd, "#define %s" % xid
 print >>fd, ""
 print >>fd, "#ifndef %s" % xid
 print >>fd, "#define %s" % xid
 print >>fd, ""

diff --git a/cinelerra-5.1/guicast/xfer/Makefile b/cinelerra-5.1/guicast/xfer/Makefile
index 0a2890103970bc3f379495c02c4d798d21a1d112..60fda49b736e6b787f7c0c497771297c8d46b4c4 100644 (file)
--- a/cinelerra-5.1/guicast/xfer/Makefile
+++ b/cinelerra-5.1/guicast/xfer/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/global_config
 $(shell mkdir -p $(OBJDIR) )
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 
 $(shell mkdir -p $(OBJDIR) )
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 

-OUTPUT := $(OBJDIR)/xfer.o
+OUTPUT := $(OBJDIR)/xfer.stamp

 
 all:   $(OUTPUT)
 
 
 all:   $(OUTPUT)
 


@@ -15,4 +15,4 @@ $(OBJDIR)/%.o:          %.C
        $(CXX) -I.. `cat $(OBJDIR)/c_flags` -O3 -DMSGQUAL=$* -c $< -o $@
 
 $(OUTPUT): $(patsubst %.C,$(OBJDIR)/%.o,$(wildcard *.C))
        $(CXX) -I.. `cat $(OBJDIR)/c_flags` -O3 -DMSGQUAL=$* -c $< -o $@
 
 $(OUTPUT): $(patsubst %.C,$(OBJDIR)/%.o,$(wildcard *.C))

-
+       touch $@