fixes for endemic (compiler?) issues with virtual inheritance of sigc::trackable. NOTE: automation list undo/redo no longer operational, fix to follow

git-svn-id: svn://localhost/ardour2/trunk@1007 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2006-10-25 20:11:42 +00:00
parent 1b39adc4ce
commit bcd511aa3f
42 changed files with 357 additions and 122 deletions

View File

@@ -7,13 +7,15 @@
#include <ardour/audiosource.h>
#include <ardour/audioregion.h>
#include <pbd/error.h>
using namespace PBD;
#include "i18n.h"
#include <pbd/statefuldestructible.h>
using namespace PBD;
#include "i18n.h"
namespace ARDOUR {
void Session::register_with_memento_command_factory(PBD::ID id, StatefulDestructible *ptr)
void Session::register_with_memento_command_factory(PBD::ID id, PBD::StatefulThingWithGoingAway *ptr)
{
registry[id] = ptr;
}
@@ -78,7 +80,7 @@ Command *Session::memento_command_factory(XMLNode *n)
if (automation_lists.count(id))
return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
} else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits here
return new MementoCommand<StatefulDestructible>(*registry[id], before, after);
return new MementoCommand<PBD::StatefulThingWithGoingAway>(*registry[id], before, after);
}
/* we failed */