Enable build for FreeBSD (part 1/2)

[ardour.git] / libs / pbd / undo.cc

diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc
index a4042a7e131bbe3e783cb70be287cdfebd72b6d6..a11edbda47d674658016dfc3b445f9c413377b81 100644 (file)
--- a/libs/pbd/undo.cc
+++ b/libs/pbd/undo.cc
@@ -1,4 +1,4 @@
-/* 
+/*
     Copyright (C) 2001 Brett Viren & Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
     $Id$
 */
 
-#include <iostream>
 #include <string>
 #include <sstream>
 #include <time.h>
@@ -39,9 +38,9 @@ UndoTransaction::UndoTransaction ()
 
 UndoTransaction::UndoTransaction (const UndoTransaction& rhs)
        : Command(rhs._name)
-       , PBD::ScopedConnectionList ()
        , _clearing(false)
 {
+        _timestamp = rhs._timestamp;
        clear ();
        actions.insert(actions.end(),rhs.actions.begin(),rhs.actions.end());
 }
@@ -52,7 +51,7 @@ UndoTransaction::~UndoTransaction ()
        clear ();
 }
 
-void 
+void
 command_death (UndoTransaction* ut, Command* c)
 {
        if (ut->clearing()) {
@@ -66,7 +65,7 @@ command_death (UndoTransaction* ut, Command* c)
        }
 }
 
-UndoTransaction& 
+UndoTransaction&
 UndoTransaction::operator= (const UndoTransaction& rhs)
 {
        if (this == &rhs) return *this;
@@ -77,15 +76,15 @@ UndoTransaction::operator= (const UndoTransaction& rhs)
 }
 
 void
-UndoTransaction::add_command (Command *const action)
+UndoTransaction::add_command (Command *const cmd)
 {
        /* catch death of command (e.g. caused by death of object to
           which it refers. command_death() is a normal static function
           so there is no need to manage this connection.
         */
 
-       action->DropReferences.connect_same_thread (*this, boost::bind (&command_death, this, action));
-       actions.push_back (action);
+       cmd->DropReferences.connect_same_thread (*this, boost::bind (&command_death, this, cmd));
+       actions.push_back (cmd);
 }
 
 void
@@ -153,12 +152,12 @@ XMLNode &UndoTransaction::get_state()
 
 class UndoRedoSignaller {
 public:
-    UndoRedoSignaller (UndoHistory& uh) 
-           : _history (uh) { 
-           _history.BeginUndoRedo(); 
+    UndoRedoSignaller (UndoHistory& uh)
+           : _history (uh) {
+           _history.BeginUndoRedo();
     }
-    ~UndoRedoSignaller() { 
-           _history.EndUndoRedo(); 
+    ~UndoRedoSignaller() {
+           _history.EndUndoRedo();
     }
 
 private:
@@ -221,6 +220,13 @@ UndoHistory::add (UndoTransaction* const ut)
        }
 
        UndoList.push_back (ut);
+       /* Adding a transacrion makes the redo list meaningless. */
+       _clearing = true;
+       for (std::list<UndoTransaction*>::iterator i = RedoList.begin(); i != RedoList.end(); ++i) {
+                delete *i;
+        }
+       RedoList.clear ();
+       _clearing = false;
 
        /* we are now owners of the transaction and must delete it when finished with it */
 
@@ -250,9 +256,6 @@ UndoHistory::undo (unsigned int n)
                return;
        }
 
-       struct timeval start, end, diff;
-       gettimeofday (&start, 0);
-
        {
                UndoRedoSignaller exception_safe_signaller (*this);
 
@@ -265,16 +268,8 @@ UndoHistory::undo (unsigned int n)
                        ut->undo ();
                        RedoList.push_back (ut);
                }
-               gettimeofday (&end, 0);
-               timersub (&end, &start, &diff);
-               cerr << "Undo-pre-signals took " << diff.tv_sec << '.' << diff.tv_usec << endl;
-
        }
 
-       gettimeofday (&end, 0);
-       timersub (&end, &start, &diff);
-       cerr << "Undo took " << diff.tv_sec << '.' << diff.tv_usec << endl;
-
        Changed (); /* EMIT SIGNAL */
 }
 
@@ -285,12 +280,9 @@ UndoHistory::redo (unsigned int n)
                return;
        }
 
-       struct timeval start, end, diff;
-       gettimeofday (&start, 0);
-
        {
                UndoRedoSignaller exception_safe_signaller (*this);
-               
+
                while (n--) {
                        if (RedoList.size() == 0) {
                                return;
@@ -300,16 +292,8 @@ UndoHistory::redo (unsigned int n)
                        ut->redo ();
                        UndoList.push_back (ut);
                }
-               gettimeofday (&end, 0);
-               timersub (&end, &start, &diff);
-               cerr << "Redo-pre-signals took " << diff.tv_sec << '.' << diff.tv_usec << endl;
        }
 
-       gettimeofday (&end, 0);
-       timersub (&end, &start, &diff);
-       cerr << "Redo took " << diff.tv_sec << '.' << diff.tv_usec << endl;
-
-       EndUndoRedo (); /* EMIT SIGNAL */
        Changed (); /* EMIT SIGNAL */
 }
 
@@ -317,6 +301,9 @@ void
 UndoHistory::clear_redo ()
 {
        _clearing = true;
+        for (std::list<UndoTransaction*>::iterator i = RedoList.begin(); i != RedoList.end(); ++i) {
+                delete *i;
+        }
        RedoList.clear ();
        _clearing = false;
 
@@ -328,6 +315,9 @@ void
 UndoHistory::clear_undo ()
 {
        _clearing = true;
+        for (std::list<UndoTransaction*>::iterator i = UndoList.begin(); i != UndoList.end(); ++i) {
+                delete *i;
+        }
        UndoList.clear ();
        _clearing = false;
 
@@ -343,7 +333,7 @@ UndoHistory::clear ()
        Changed (); /* EMIT SIGNAL */
 }
 
-XMLNode& 
+XMLNode&
 UndoHistory::get_state (int32_t depth)
 {
     XMLNode *node = new XMLNode ("UndoHistory");