X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=a0aec63baf641caeef00ca699c33b61757faa89c;hb=d94bbdeebde4f16a77c388f9f28114b945db41d9;hp=e688a06e3d4af5f44b81a85e9a47b1453de43f3c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C index e688a06e..a0aec63b 100644 --- a/cinelerra-5.1/cinelerra/mainundo.C +++ b/cinelerra-5.1/cinelerra/mainundo.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 1997-2011 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "asset.h" @@ -35,7 +35,7 @@ #include "undostack.h" MainUndo::MainUndo(MWindow *mwindow) -{ +{ this->mwindow = mwindow; undo_stack = new UndoStack; last_update = new Timer; @@ -48,14 +48,14 @@ MainUndo::~MainUndo() } -void MainUndo::update_undo_entry(const char *description, +void MainUndo::update_undo_entry(const char *description, uint32_t load_flags, - void *creator, + void *creator, int changes_made) { FileXML file; - mwindow->edl->save_xml(&file, + mwindow->edl->save_xml(&file, "", 0, 0); @@ -133,7 +133,7 @@ void MainUndo::update_undo_before(const char *description, void *creator) update_undo_entry("", 0, creator, 0); } -void MainUndo::update_undo_after(const char *description, +void MainUndo::update_undo_after(const char *description, uint32_t load_flags, int changes_made) { @@ -164,133 +164,105 @@ void MainUndo::update_undo_after(const char *description, } -int MainUndo::undo() +UndoStackItem *MainUndo::next_undo() { - UndoStackItem *current = undo_stack->current; - char after_description[BCTEXTLEN]; - after_description[0] = 0; + return undo_stack->get_current_undo(); +} - mwindow->undo_commercial(); +UndoStackItem *MainUndo::next_redo() +{ + return undo_stack->get_current_redo(); +} -//printf("MainUndo::undo 1\n"); -//dump(); +int MainUndo::undo_load_flags() +{ + UndoStackItem *item = next_undo(); + return item ? item->get_flags() : 0; +} -// Rewind to an after entry - if(current && !(undo_stack->number_of(current) % 2)) - { - current = PREVIOUS; - } +int MainUndo::redo_load_flags() +{ + UndoStackItem *item = next_redo(); + return item ? item->get_flags() : 0; +} -// Rewind to a before entry - if(current && (undo_stack->number_of(current) % 2)) - { - strcpy(after_description, current->get_description()); - current = PREVIOUS; - } -// Now have an even number - if(current) - { - undo_stack->current = current; +int MainUndo::undo() +{ + mwindow->undo_commercial(); + 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 ) { // Set the redo text to the current description - if(mwindow->gui) - mwindow->gui->mainmenu->redo->update_caption( - after_description); - + if( mwindow->gui ) { + UndoStackItem *next = NEXT; + mwindow->gui->mainmenu->redo-> + update_caption(next ? next->get_description() : ""); + } FileXML file; char *current_data = current->get_data(); - if(current_data) - { + if( current_data ) { file.read_from_string(current_data); load_from_undo(&file, current->get_flags()); //printf("MainUndo::undo %d %s\n", __LINE__, current->get_filename()); mwindow->set_filename(current->get_filename()); delete [] current_data; -// move current entry back one step - undo_stack->pull(); - - - if(mwindow->gui) - { + if( mwindow->gui ) { // Now update the menu with the after entry - current = PREVIOUS; -// Must be a previous entry to perform undo - if(current) - mwindow->gui->mainmenu->undo->update_caption( - current->get_description()); - else - mwindow->gui->mainmenu->undo->update_caption(""); + UndoStackItem *prev = PREVIOUS; + mwindow->gui->mainmenu->undo-> + update_caption(prev ? prev->get_description() : ""); } } } - -//dump(); reset_creators(); + mwindow->reset_caches(); return 0; } + int MainUndo::redo() { - UndoStackItem *current = undo_stack->current; -//printf("MainUndo::redo 1\n"); -//dump(); - -// Get 1st entry - if(!current) current = undo_stack->first; - -// Advance to a before entry - if(current && (undo_stack->number_of(current) % 2)) - { - current = NEXT; - } - -// Advance to an after entry - if(current && !(undo_stack->number_of(current) % 2)) - { - current = NEXT; - } - - if(current) - { - FileXML file; - char *current_data = current->get_data(); + UndoStackItem *current = next_redo(); + if( current ) { undo_stack->current = current; - - if(current_data) - { + char *current_data = current->get_data(); + if( current_data ) { + FileXML file; mwindow->set_filename(current->get_filename()); file.read_from_string(current_data); load_from_undo(&file, current->get_flags()); delete [] current_data; - if(mwindow->gui) - { + if( mwindow->gui ) { // Update menu - mwindow->gui->mainmenu->undo->update_caption(current->get_description()); - + mwindow->gui->mainmenu->undo-> + update_caption(current->get_description()); // Get next after entry - current = NEXT; - if(current) - current = NEXT; - - if(current) - mwindow->gui->mainmenu->redo->update_caption(current->get_description()); - else - mwindow->gui->mainmenu->redo->update_caption(""); + if( (current=NEXT) ) current = NEXT; + mwindow->gui->mainmenu->redo-> + update_caption(current ? current->get_description() : ""); } } } reset_creators(); + mwindow->reset_caches(); //dump(); return 0; } -// Here the master EDL loads +// Here the master EDL loads int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags) { + if( load_flags & LOAD_SESSION ) + mwindow->close_mixers(); mwindow->edl->load_xml(file, load_flags); for(Asset *asset = mwindow->edl->assets->first; asset; @@ -298,13 +270,16 @@ int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags) { mwindow->mainindexes->add_next_asset(0, asset); } - + for(int i = 0; i < mwindow->edl->nested_edls->size(); i++) { EDL *nested_edl = mwindow->edl->nested_edls->get(i); mwindow->mainindexes->add_next_asset(0, nested_edl); } mwindow->mainindexes->start_build(); + mwindow->update_plugin_guis(1); + if( load_flags & LOAD_SESSION ) + mwindow->open_mixers(); return 0; }